diff --git a/src/api/system/appMenu.js b/src/api/system/appMenu.js
new file mode 100644
index 0000000..960e802
--- /dev/null
+++ b/src/api/system/appMenu.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询前端菜单列表
+export function listMenu(query) {
+  return request({
+    url: '/system/appMenu/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询前端菜单详细
+export function getMenu(menuId) {
+  return request({
+    url: '/system/appMenu/' + menuId,
+    method: 'get'
+  })
+}
+
+// 新增前端菜单
+export function addMenu(data) {
+  return request({
+    url: '/system/appMenu',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改前端菜单
+export function updateMenu(data) {
+  return request({
+    url: '/system/appMenu',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除前端菜单
+export function delMenu(menuId) {
+  return request({
+    url: '/system/appMenu/' + menuId,
+    method: 'delete'
+  })
+}
diff --git a/src/assets/icons/svg/user2.png b/src/assets/icons/svg/user2.png
new file mode 100644
index 0000000..24079ab
Binary files /dev/null and b/src/assets/icons/svg/user2.png differ
diff --git a/src/assets/icons/svg/user2.svg b/src/assets/icons/svg/user2.svg
new file mode 100644
index 0000000..d14cbd7
--- /dev/null
+++ b/src/assets/icons/svg/user2.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1737079166930" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6599" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M511.6 513.6m-447.8 0a447.8 447.8 0 1 0 895.6 0 447.8 447.8 0 1 0-895.6 0Z" fill="#ACD895" p-id="6600"></path><path d="M474.3 959.5h75.6c74-5.7 140.3-29.7 198.9-66.4-8.7-19.1-18-38.1-25.7-50.2-21-32.9-95.6-65.8-95.6-65.8l-116.6-21h-0.4l-116.5 21s-74.7 32.8-95.6 65.8c-7.5 11.7-17.3 30.9-25.8 49.5 59.3 37.6 131 62.3 201.7 67.1z" fill="#EAEAE8" p-id="6601"></path><path d="M571.8 783.1l-122.5-0.6V640.2h122.5v142.9z m0 0" fill="#FFDDB8" p-id="6602"></path><path d="M512.4 961.4c15 0 29.8-0.9 44.5-2.3l59.3-189.7-103.7-13.3-1.3 7.1-1.2-7.3-104.2 13.4L465 958.7c15.5 1.8 31.3 2.7 47.4 2.7z" fill="#EAEAE8" p-id="6603"></path><path d="M508.1 311.3c-0.5 0-1 0.1-1.5 0.1s-1-0.1-1.5-0.1c-92.2 0-173.1 89.8-173.1 200.6s110.3 200.6 173.1 200.6c0.5 0 1 0 1.5-0.1 0.5 0.1 1 0.1 1.5 0.1 62.8 0 173.1-89.8 173.1-200.6s-80.9-200.6-173.1-200.6z" fill="#FFDDB8" p-id="6604"></path><path d="M321.7 456.7c-2.9-50.8-5.8-122.5 14.5-167.3 20.3-44.8 127.8-92.7 174.1-92.7 46.4 0 136.4 44.8 156.8 71.7 12 15.8 30.3 102.5 29 176.3-0.9 51.9-9 71.9-17.4 86.6-4.2 7.4 5.8-95.6-87.1-176.3-14.5-9-28 5.6-46.5 9-30.8 5.7-58.1 5.9-81.3 5.9-27.1 0-76.9 34.8-89.9 68.7-23.1 60-17.4 104.6-17.4 104.6s-31.9-35.6-34.8-86.5z m0 0" fill="#634335" p-id="6605"></path><path d="M320.7 514.2c7.4 23.6 23 39.8 34.8 36.1 11.8-3.7 15.4-25.8 8.1-49.5-7.4-23.6-23-39.8-34.8-36.1-11.9 3.8-15.5 25.9-8.1 49.5z m0 0M663.4 544.3c11.8 3.7 27.4-12.5 34.8-36.1 7.4-23.6 3.8-45.8-8.1-49.5-11.8-3.7-27.4 12.4-34.8 36.1-7.4 23.7-3.8 45.8 8.1 49.5z m0 0" fill="#FFDDB8" p-id="6606"></path><path d="M510.5 756.2h0.1z" fill="#FAB729" p-id="6607"></path><path d="M488.9 960.8c7.8 0.4 15.6 0.6 23.5 0.6 6.9 0 13.8-0.2 20.6-0.5l-9.1-91.2 50.8-110.6-65.8-3-62.7 3 49.7 110.6-7 91.1z" fill="#333333" p-id="6608"></path><path d="M441.1 714.1l68.7 41.8-113.6 89.7V756l44.9-41.9z m137.5 0L509.8 756l113.5 89.7V756l-44.7-41.9z m0 0" fill="#FFFFFF" p-id="6609"></path></svg>
\ No newline at end of file
diff --git a/src/views/system/appMenu/index.vue b/src/views/system/appMenu/index.vue
new file mode 100644
index 0000000..fc55f73
--- /dev/null
+++ b/src/views/system/appMenu/index.vue
@@ -0,0 +1,349 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="菜单名称" prop="menuName">
+        <el-input
+          v-model="queryParams.menuName"
+          placeholder="请输入菜单名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="父菜单ID" prop="parentId">
+        <el-input
+          v-model="queryParams.parentId"
+          placeholder="请输入父菜单ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="显示顺序" prop="orderNum">
+        <el-input
+          v-model="queryParams.orderNum"
+          placeholder="请输入显示顺序"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="菜单状态" prop="visible">
+        <el-input
+          v-model="queryParams.visible"
+          placeholder="请输入菜单状态"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:menu:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:menu:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:menu:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:menu:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="menuList" @selection-change="handleSelectionChange" :default-sort="defaultSort"  @sort-change="onSortChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <template v-for="column of showColumns">
+        <el-table-column
+            :key="column.key"
+            :label="column.label"
+            :prop="column.key"
+            :align="column.align"
+            :min-width="column.minWidth"
+            :sort-orders="orderSorts"
+            :sortable="column.sortable"
+            :show-overflow-tooltip="column.overflow"
+            :width="column.width"
+        >
+          <template slot-scope="d">
+            <template v-if="column.key === 'menuId'">
+              {{d.row[column.key]}}
+            </template>
+            <template v-else>
+              {{d.row[column.key]}}
+            </template>
+          </template>
+        </el-table-column>
+      </template>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:menu:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:menu:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改前端菜单对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="菜单名称" prop="menuName">
+          <el-input v-model="form.menuName" placeholder="请输入菜单名称" />
+        </el-form-item>
+        <el-form-item label="父菜单ID" prop="parentId">
+          <el-input v-model="form.parentId" placeholder="请输入父菜单ID" />
+        </el-form-item>
+        <el-form-item label="显示顺序" prop="orderNum">
+          <el-input v-model="form.orderNum" placeholder="请输入显示顺序" />
+        </el-form-item>
+        <el-form-item label="菜单状态" prop="visible">
+          <el-input v-model="form.visible" placeholder="请输入菜单状态" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listMenu, getMenu, delMenu, addMenu, updateMenu } from "@/api/system/appMenu";
+import { $showColumns } from '@/utils/mixins';
+
+// 默认排序字段
+const defaultSort = {
+  prop: "createTime",
+  order: "descending"
+}
+
+export default {
+  name: "Menu",
+  mixins: [$showColumns],
+  data() {
+    return {
+      // 字段列表
+      columns: [
+        {key: 'menuId', visible: true, label: '菜单ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'menuName', visible: true, label: '菜单名称', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'parentId', visible: true, label: '父菜单ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'orderNum', visible: true, label: '显示顺序', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'visible', visible: true, label: '菜单状态（0显示 1隐藏）', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'status', visible: true, label: '菜单状态（0正常 1停用）', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'remark', visible: true, label: '备注', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+      ],
+      // 排序方式
+      orderSorts: ['ascending', 'descending', null],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 前端菜单表格数据
+      menuList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      defaultSort,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        orderByColumn: defaultSort.prop,
+        isAsc: defaultSort.order,
+        menuName: null,
+        parentId: null,
+        orderNum: null,
+        visible: null,
+        status: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        menuName: [
+          { required: true, message: "菜单名称不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 当排序按钮被点击时触发 **/
+    onSortChange(column) {
+      if (column.order == null) {
+        this.queryParams.orderByColumn = defaultSort.prop;
+        this.queryParams.isAsc = defaultSort.order;
+      } else {
+        this.queryParams.orderByColumn = column.prop;
+        this.queryParams.isAsc = column.order;
+      }
+      this.getList();
+    },
+    /** 查询前端菜单列表 */
+    getList() {
+      this.loading = true;
+      listMenu(this.queryParams).then(response => {
+        this.menuList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        menuId: null,
+        menuName: null,
+        parentId: null,
+        orderNum: null,
+        visible: null,
+        status: null,
+        createBy: null,
+        createTime: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.menuId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加前端菜单";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const menuId = row.menuId || this.ids
+      getMenu(menuId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改前端菜单";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.menuId != null) {
+            updateMenu(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addMenu(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const menuIds = row.menuId || this.ids;
+      this.$modal.confirm('是否确认删除前端菜单编号为"' + menuIds + '"的数据项？').then(function() {
+        return delMenu(menuIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/menu/export', {
+        ...this.queryParams
+      }, `menu_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/src/views/system/equipment/index.vue b/src/views/system/equipment/index.vue
index 9da29f6..0f87318 100644
--- a/src/views/system/equipment/index.vue
+++ b/src/views/system/equipment/index.vue
@@ -63,8 +63,13 @@
             <template v-else-if="column.key === 'tags'">
               <dict-tag :options="dict.type.ss_room_tags" :value="d.row[column.key]" />
             </template>
-            <template v-else-if="column.key === 'picture'">
-              <image-preview :src="d.row[column.key]" :width="50" :height="50" />
+            <template v-else-if="column.key === 'pictures'">
+              <image-preview
+                :src="Array.isArray(d.row[column.key]) ? d.row[column.key][0] : d.row[column.key]"
+                :width="50"
+                :height="50"
+                fit="cover"
+              />
             </template>
             <template v-else-if="column.key === 'status'">
               <dict-tag :options="dict.type.ss_room_status" :value="d.row[column.key]" />
diff --git a/src/views/system/room/index.vue b/src/views/system/room/index.vue
index 37a780e..e7f7c14 100644
--- a/src/views/system/room/index.vue
+++ b/src/views/system/room/index.vue
@@ -224,13 +224,13 @@
 <script>
 import { listRoom, getRoom, delRoom, addRoom, updateRoom } from "@/api/system/room";
 import { $showColumns } from '@/utils/mixins';
-import { listStore } from "../../../api/system/store";
+import { listStore } from "@/api/system/store";
 import { listRule } from "@/api/system/rule";
 import { listUser } from "@/api/system/user";
 
 // 默认排序字段
 const defaultSort = {
-  prop: "createTime",
+  prop: "roomId",
   order: "descending"
 }
 
@@ -525,7 +525,7 @@ export default {
       }
       // 根据商户ID筛选店铺
       this.getStoreOptions(merchantId);
-      
+
       // 根据商户ID筛选押金
       if (this.form.billingMode === 'basePrice') {
         this.getBasePriceOptions(merchantId);
diff --git a/src/views/system/store/index.vue b/src/views/system/store/index.vue
index b8f3f20..0c84e1d 100644
--- a/src/views/system/store/index.vue
+++ b/src/views/system/store/index.vue
@@ -155,10 +155,10 @@
           </template>
         </el-table-column>
       </template>
-      <el-table-column 
-        label="操作" 
-        align="center" 
-        width="180" 
+      <el-table-column
+        label="操作"
+        align="center"
+        width="180"
         class-name="small-padding fixed-width"
         fixed="right"
       >
@@ -317,77 +317,12 @@
     </el-dialog>
 
     <!-- 绑定大门弹窗 -->
-    <el-dialog :title="'绑定大门 - ' + bindForm.storeName" :visible.sync="bindDialogVisible" width="900px" append-to-body>
-      <div class="filter-container">
-        <el-input
-          v-model="deviceQuery.sn"
-          placeholder="请输入设备SN"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="loadDeviceList"
-        />
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="loadDeviceList">
-          搜索
-        </el-button>
-      </div>
-      <div class="device-list dialog-content" v-loading="deviceLoading">
-        <el-table
-          :data="deviceList"
-          @row-click="handleDeviceSelect"
-          highlight-current-row
-          :row-class-name="tableRowClassName"
-          style="width: 100%"
-        >
-          <el-table-column label="设备图片" width="80" align="center">
-            <template slot-scope="scope">
-              <el-image
-                :src="scope.row.picture || scope.row.customPicture"
-                :preview-src-list="[scope.row.picture || scope.row.customPicture]"
-                fit="cover"
-                style="width: 50px; height: 50px; border-radius: 4px;"
-              >
-                <div slot="error" class="image-slot">
-                  <i class="el-icon-picture-outline"></i>
-                </div>
-              </el-image>
-            </template>
-          </el-table-column>
-          <el-table-column prop="sn" label="设备SN" width="180" />
-          <el-table-column prop="mac" label="MAC地址" width="180" />
-          <el-table-column prop="name" label="设备名称" min-width="120">
-            <template slot-scope="scope">
-              {{ scope.row.name || '-' }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="model" label="型号" />
-          <el-table-column prop="status" label="状态">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.as_device_status" :value="scope.row.status"/>
-            </template>
-          </el-table-column>
-          <el-table-column prop="placementStatus" label="投放状态">
-            <template slot-scope="scope">
-              <el-tag :type="scope.row.placementStatus === '1' ? 'success' : 'info'">
-                {{ scope.row.placementStatus === '1' ? '已投放' : '未投放' }}
-              </el-tag>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="pagination-container">
-          <pagination
-            v-show="deviceTotal>0"
-            :total="deviceTotal"
-            :page.sync="deviceQuery.pageNum"
-            :limit.sync="deviceQuery.pageSize"
-            @pagination="loadDeviceList"
-          />
-        </div>
-      </div>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="bindDialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="confirmBindGate" :loading="bindLoading" :disabled="!selectedDevice">确 定</el-button>
-      </div>
-    </el-dialog>
+    <BindGateDialog
+      :visible.sync="showBindGateDialog"
+      :storeName="selectedStoreName"
+      :storeId="selectedStoreId"
+      @bind-success="handleBindSuccess"
+    />
   </div>
 </template>
 
@@ -398,6 +333,7 @@ import { listDevice } from "@/api/system/device";
 import { bindGate, unbindDevice } from "@/api/system/store";
 import DeviceLink from '@/components/Business/Device/DeviceLink';
 import MapSelect from '@/components/MapSelect'
+import BindGateDialog from './components/BindGateDialog.vue';
 
 // 默认排序字段
 const defaultSort = {
@@ -409,7 +345,8 @@ export default {
   name: "Store",
   components: {
     DeviceLink,
-    MapSelect
+    MapSelect,
+    BindGateDialog
   },
   mixins: [$showColumns],
   dicts: ['ss_store_status', 'ss_store_tags', 'ss_room_type'],
@@ -528,23 +465,9 @@ export default {
         ]
       },
       // 绑定大门相关数据
-      bindDialogVisible: false,
-      deviceLoading: false,
-      bindLoading: false,
-      deviceList: [],
-      selectedDevice: null,
-      bindForm: {
-        storeId: null,
-        storeName: '',
-      },
-      deviceQuery: {
-        pageNum: 1,
-        pageSize: 10,
-        sn: '',
-        status: '1',
-        placementStatus: '0'
-      },
-      deviceTotal: 0,
+      showBindGateDialog: false,
+      selectedStoreName: '',
+      selectedStoreId: null,
     };
   },
   created() {
@@ -740,56 +663,18 @@ export default {
       }
     },
     /** 打开绑定大门弹窗 */
-    handleBindGate(row) {
-      this.bindForm.storeId = row.storeId;
-      this.bindForm.storeName = row.name;
-      this.bindDialogVisible = true;
-      this.selectedDevice = null;
-      this.loadDeviceList(row.merchantId);
-    },
-    /** 加载设备列表 */
-    loadDeviceList(merchantId) {
-      this.deviceLoading = true;
-      listDevice({
-        ...this.deviceQuery,
-        placementStatus: '0',
-        merchantId
-      }).then(response => {
-        this.deviceList = response.rows;
-        this.deviceTotal = response.total;
-      }).finally(() => {
-        this.deviceLoading = false;
-      });
-    },
-    /** 选择设备 */
-    handleDeviceSelect(row) {
-      this.selectedDevice = row;
-    },
-    /** 确认绑定 */
-    confirmBindGate() {
-      if (!this.selectedDevice || !this.bindForm.storeId) {
-        this.$modal.msgError("请选择要绑定的设备");
+    handleBindGate(store) {
+      if (!store || !store.storeId) {
+        this.$modal.msgError("请选择一个店铺");
         return;
       }
-
-      this.bindLoading = true;
-      bindGate({
-        storeId: this.bindForm.storeId,
-        deviceId: this.selectedDevice.deviceId
-      }).then(() => {
-        this.$modal.msgSuccess("绑定成功");
-        this.bindDialogVisible = false;
-        this.getList();  // 刷新列表
-      }).finally(() => {
-        this.bindLoading = false;
-      });
+      this.selectedStoreName = store.name;
+      this.selectedStoreId = store.storeId;
+      this.showBindGateDialog = true;
     },
-    // 添加行样式方法
-    tableRowClassName({row}) {
-      if (row.placementStatus === '1') {
-        return 'placed-row';
-      }
-      return '';
+    handleBindSuccess() {
+      this.showBindGateDialog = false;
+      this.getList();
     },
     /** 解除绑定 */
     handleUnbindGate(row) {
@@ -803,10 +688,6 @@ export default {
         });
       }).catch(() => {});
     },
-    /** 校验营业时间 */
-    validateBusinessTime() {
-      this.$refs.form.validateField(['businessTimeStart', 'businessTimeEnd']);
-    },
     handleMapSelect(location) {
       this.form.address = location.address
       this.form.lng = location.lng
@@ -824,6 +705,16 @@ export default {
         }
       }
     },
+    validateBusinessTime() {
+      if (this.form.businessTimeStart && this.form.businessTimeEnd) {
+        const start = this.form.businessTimeStart.split(':').map(Number);
+        const end = this.form.businessTimeEnd.split(':').map(Number);
+        if (start[0] > end[0] || (start[0] === end[0] && start[1] >= end[1])) {
+          this.$message.error('结束时间必须大于开始时间');
+          this.form.businessTimeEnd = '';
+        }
+      }
+    },
   }
 };
 </script>
diff --git a/src/views/system/store/store_detail.vue b/src/views/system/store/store_detail.vue
index 2bbed30..a8d3d5e 100644
--- a/src/views/system/store/store_detail.vue
+++ b/src/views/system/store/store_detail.vue
@@ -67,6 +67,16 @@
               <el-descriptions-item label="类型">
                 <dict-tag :options="dict.type.ss_room_type" :value="storeData.typeTags" />
               </el-descriptions-item>
+              <el-descriptions-item label="大门">
+                <router-link
+                  v-if="storeData.gateSn"
+                  :to="`/system/deviceDetail/index/${storeData.gateId}`"
+                  class="link-type"
+                >
+                  {{ storeData.gateSn }}
+                </router-link>
+                <el-button v-else type="primary" @click="showBindGateDialog = true">去绑定</el-button>
+              </el-descriptions-item>
             </el-descriptions>
           </div>
         </el-col>
@@ -197,7 +207,29 @@
         <room :storeId="Number(storeId)"></room>
       </el-tab-pane>
       <el-tab-pane label="设施列表" name="equipments">
-        <equipment :storeId="Number(storeId)"></equipment>
+        <el-table :data="equipmentList" style="width: 100%">
+          <el-table-column label="设施图片" width="80" align="center">
+            <template slot-scope="scope">
+              <el-image
+                :src="scope.row.picture || scope.row.customPicture"
+                :preview-src-list="[scope.row.picture || scope.row.customPicture]"
+                fit="cover"
+                style="width: 50px; height: 50px; border-radius: 4px;"
+              >
+                <div slot="error" class="image-slot">
+                  <i class="el-icon-picture-outline"></i>
+                </div>
+              </el-image>
+            </template>
+          </el-table-column>
+          <el-table-column prop="name" label="设施名称" />
+          <el-table-column prop="status" label="状态">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.as_device_status" :value="scope.row.status"/>
+            </template>
+          </el-table-column>
+          <!-- 其他列 -->
+        </el-table>
       </el-tab-pane>
       <el-tab-pane label="设备列表" name="devices">
         <device :storeId="Number(storeId)"></device>
@@ -209,10 +241,17 @@
         <toilet :storeId="Number(storeId)"></toilet>
       </el-tab-pane>
     </el-tabs>
+
+    <BindGateDialog
+      :visible.sync="showBindGateDialog"
+      :storeName="storeData.storeName"
+      :storeId="Number(storeId)"
+      @bind-success="getStoreData"
+    />
   </div>
 </template>
 <script>
-import { getStore, delStore } from "@/api/system/store";
+import { getStore, delStore, bindGateApi } from "@/api/system/store";
 import * as echarts from 'echarts';
 import AMapLoader from "@amap/amap-jsapi-loader";
 import globalConfig from '@/utils/config/globalConfig';
@@ -222,6 +261,7 @@ import equipment from '@/views/system/equipment/index.vue';
 import device from '@/views/system/device/index.vue';
 import user from '@/views/user/user/index.vue';
 import toilet from '@/views/system/toilet/index.vue';
+import BindGateDialog from './components/BindGateDialog.vue';
 
 export default {
   name: 'StoreDetail',
@@ -232,7 +272,8 @@ export default {
     equipment,
     device,
     user,
-    toilet
+    toilet,
+    BindGateDialog
   },
   data() {
     return {
@@ -253,12 +294,14 @@ export default {
       chartTimeRange: 'week',
       incomeChart: null,
       activeTab: 'orders',
+      showBindGateDialog: false,
+      equipmentList: []
     }
   },
   created() {
     this.storeId = this.$route.params.storeId;
     this.getStoreData();
-    // this.getStoreStats();
+    this.loadEquipmentList();
   },
   mounted() {
     this.$nextTick(() => {
@@ -499,6 +542,19 @@ export default {
         this.$modal.msgSuccess("删除成功");
         this.$router.push('/system/store/list');
       }).catch(() => { });
+    },
+    bindGate() {
+      // 调用绑定大门的接口
+      bindGateApi().then(response => {
+        this.$modal.msgSuccess("绑定成功");
+        this.fetchStoreDetail(); // 重新获取店铺详情
+      }).catch(error => {
+        this.$modal.msgError("绑定失败");
+      });
+    },
+    loadEquipmentList() {
+      // 实现加载设施列表的逻辑
+      // 例如：this.equipmentList = response.data;
     }
   }
 }
@@ -866,4 +922,14 @@ export default {
 :deep(.el-tag) {
   margin-right: 8px;
 }
+
+.link-type {
+  color: #409EFF;
+  text-decoration: underline;
+  cursor: pointer;
+}
+
+.link-type:hover {
+  color: #66b1ff;
+}
 </style>
diff --git a/src/views/system/withdraw/index.vue b/src/views/system/withdraw/index.vue
index 130f16c..c260b8b 100644
--- a/src/views/system/withdraw/index.vue
+++ b/src/views/system/withdraw/index.vue
@@ -297,11 +297,11 @@ export default {
       this.user = response.data;
     });
     this.getList();
-    if(this.userName === 'admin'){
-      listDept({status: '0',pageNum:1,pageSize:999  }).then(response => {
-        this.deptOptions = response.data;
-      });
-    }
+    // if(this.userName === 'admin'){
+    //   listDept({status: '0',pageNum:1,pageSize:999  }).then(response => {
+    //     this.deptOptions = response.data;
+    //   });
+    // }
   },
   methods: {
     /** 审核 */
diff --git a/src/views/user/user/components/UserConfigDialog.vue b/src/views/user/user/components/UserConfigDialog.vue
index 5aa998d..5411831 100644
--- a/src/views/user/user/components/UserConfigDialog.vue
+++ b/src/views/user/user/components/UserConfigDialog.vue
@@ -1,48 +1,78 @@
 <template>
-  <el-dialog :visible.sync="visible" width="700px" title="用户配置" @open="onOpen">
+  <el-dialog :visible.sync="visible" width="800px" title="用户配置" @open="onOpen">
     <el-form ref="form" :model="form" :rules="rules" label-width="5em" v-loading="loading">
       <el-row v-if="showCurrent">
         <form-col :span="span" label="当前用户" label-width="5em">
           {{form.userName}}
         </form-col>
       </el-row>
-<!--      <el-row>-->
-<!--        <group-title title="订单显示用户手机号"/>-->
-<!--        <form-col :span="10" label="是否开启" label-width="5em">-->
-<!--          <el-switch v-model="form.showBillMobile" active-text="开启" inactive-text="不开启"/>-->
-<!--        </form-col>-->
-<!--        <form-col :span="14" label="单价" prop="showBillMobilePrice" v-if="form.showBillMobile">-->
-<!--          <el-input v-model="form.showBillMobilePrice" :min="0" type="number" placeholder="请输入单价">-->
-<!--            <template #append>元 / 单</template>-->
-<!--          </el-input>-->
-<!--        </form-col>-->
-<!--      </el-row>-->
-
-<!--      <el-row>-->
-<!--        <group-title title="风控配置"/>-->
-<!--        <form-col :span="span" label="充值延迟到账" prop="arrivalDelay" label-width="7em">-->
-<!--          <el-input v-model="form.arrivalDelay" placeholder="请输入到账延迟时长">-->
-<!--            <template #append>小时</template>-->
-<!--          </el-input>-->
-<!--        </form-col>-->
-<!--      </el-row>-->
-<!--      <el-row >-->
-<!--        <group-title title="代理商配置"/>-->
-<!--        <form-col :span="span" label="默认设备服务费" label-width="8em" prop="agentDeviceService">-->
-<!--          <el-input v-model="form.agentDeviceService" type="number" :min="0" placeholder="请输入默认设备服务费">-->
-<!--            <template #append>%</template>-->
-<!--          </el-input>-->
-<!--        </form-col>-->
-<!--        <form-col :span="span" label="商户开关/充值设备" label-width="10em" prop="agentDeviceService">-->
-<!--          <el-switch v-model="form.agentAllowMchSwitch" active-text="允许" inactive-text="不允许"/>-->
-<!--        </form-col>-->
-<!--      </el-row>-->
-
       <el-row>
         <group-title title="其他设置"/>
         <form-col :span="8" label="是否为设备管理员" label-width="9em" prop="deviceAdmin">
           <el-switch v-model="form.deviceAdmin" active-text="是" inactive-text="否" @change="onChangeDeviceAdmin"/>
         </form-col>
+        <form-col :span="8" label="服务费率" label-width="9em" prop="serviceFeeProportion">
+          <el-input-number v-model="form.serviceFeeProportion" :min="0" :max="100" :step="0.1" placeholder="请输入服务费率">
+            <template #append>%</template>
+          </el-input-number>
+        </form-col>
+        <form-col :span="8" label="分红比例" label-width="9em" prop="dividendProportion">
+          <el-input-number v-model="form.dividendProportion" :min="0" :max="100" :step="0.1" placeholder="请输入分红比例">
+            <template #append>%</template>
+          </el-input-number>
+        </form-col>
+      </el-row>
+
+      <!-- 添加基础配置 -->
+      <el-row>
+        <group-title title="基础配置"/>
+        <form-col :span="8" label="取消时长设置" label-width="9em" prop="agoCancel">
+          <el-input-number v-model="form.agoCancel" :min="0" placeholder="请输入取消时长">
+            <template #append>分钟</template>
+          </el-input-number>
+        </form-col>
+        <form-col :span="8" label="违约金" label-width="9em" prop="penalty">
+          <el-input-number v-model="form.penalty" :min="0" placeholder="请输入违约金">
+            <template #append>元</template>
+          </el-input-number>
+        </form-col>
+        <form-col :span="8" label="提前开门时间" label-width="9em" prop="beforeTime">
+          <el-input-number v-model="form.beforeTime" :min="0" placeholder="请输入提前开门时间">
+            <template #append>分钟</template>
+          </el-input-number>
+        </form-col>
+      </el-row>
+
+      <!-- 添加保洁设置 -->
+      <el-row>
+        <group-title title="保洁设置"/>
+        <form-col :span="8" label="保洁时长" label-width="9em" prop="cleanDuration">
+          <el-input-number v-model="form.cleanDuration" :min="0" placeholder="请输入保洁时长">
+            <template #append>分钟</template>
+          </el-input-number>
+        </form-col>
+        <form-col :span="8" label="保洁通知" label-width="9em" prop="cleanNotice">
+          <el-select v-model="form.cleanNotice" placeholder="请选择保洁通知">
+            <el-option
+              v-for="dict in dict.type.ss_clean_notice"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"/>
+          </el-select>
+        </form-col>
+      </el-row>
+
+      <!-- 添加权限配置 -->
+      <el-row>
+        <group-title title="前端菜单"/>
+        <el-tree
+          :data="menuTree"
+          show-checkbox
+          node-key="menuId"
+          :default-checked-keys="Array.isArray(form.appMenus) ? form.appMenus : []"
+          :props="defaultProps"
+          ref="menuTree"
+        ></el-tree>
       </el-row>
 
     </el-form>
@@ -57,11 +87,14 @@
 import LineField from '@/components/LineField/index.vue'
 import GroupTitle from '@/components/GroupTitle/index.vue'
 import { SmUserType } from '@/utils/constants'
-import {getUser ,updateUser } from '@/api/user/user';
+import { getUser, updateUser } from '@/api/user/user';
+import { listMenu as listAppMenu } from "@/api/system/appMenu";
+import { mapState } from 'vuex';
 
 export default {
   name: "UserConfigDialog",
   components: { GroupTitle, LineField },
+  dicts: ['ss_clean_notice'],
   props: {
     show: {
       type: Boolean,
@@ -77,6 +110,9 @@ export default {
     }
   },
   computed: {
+    ...mapState({
+      dict: state => state.dict // 从 Vuex 中获取 dict
+    }),
     SmUserType() {
       return SmUserType
     },
@@ -92,7 +128,21 @@ export default {
   data() {
     return {
       span: 12,
-      form: {},
+      form: {
+        userId: null,
+        userName: '',
+        phonenumber: '',
+        userType: '',
+        deviceAdmin: false,
+        serviceFeeProportion: 0,
+        dividendProportion: 0,
+        agoCancel: 0,
+        penalty: 0,
+        beforeTime: 0,
+        cleanDuration: 0,
+        cleanNotice: '',
+        appMenus: []
+      },
       rules: {
         showBillMobilePrice: [
           { required: true, message: '请输入单价', trigger: 'blur' }
@@ -100,6 +150,11 @@ export default {
       },
       loading: false,
       submitLoading: false,
+      menuTree: [],
+      defaultProps: {
+        children: 'children',
+        label: 'menuName'
+      }
     }
   },
   methods: {
@@ -107,7 +162,11 @@ export default {
       if (this.userId != null) {
         this.loading = true;
         getUser(this.userId).then(response => {
-          this.form = response.data;
+          this.form = { ...this.form, ...response.data };
+          if (this.form.userType !== '00') {
+            this.form.dividendProportion *= 100;
+          }
+          this.getMenuTree();
         }).finally(() => {
           this.loading = false;
         })
@@ -115,8 +174,34 @@ export default {
         this.reset();
       }
     },
-    /** 提交按钮 */
+    getMenuTree() {
+      listAppMenu({pageSize:999}).then(response => {
+        this.menuTree = this.transformMenuData(response.rows);
+      });
+    },
+    transformMenuData(data) {
+      const map = {};
+      data.forEach(item => {
+        map[item.menuId] = { ...item, children: [] };
+      });
+      const tree = [];
+      data.forEach(item => {
+        if (item.parentId === 0) {
+          tree.push(map[item.menuId]);
+        } else {
+          if (map[item.parentId]) {
+            map[item.parentId].children.push(map[item.menuId]);
+          }
+        }
+      });
+      return tree;
+    },
     submitForm() {
+      const checkedNodes = this.$refs.menuTree.getCheckedKeys();
+      this.form.appMenus = checkedNodes;
+      if (this.form.userType !== '00') {
+        this.form.dividendProportion = this.form.dividendProportion / 100;
+      }
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.userId != null) {
@@ -132,19 +217,16 @@ export default {
         }
       });
     },
-    // 取消按钮
     cancel() {
       this.visible = false;
       this.reset();
     },
-    // 重置
     reset() {
       this.form = {
         userId: this.userId,
       };
       this.resetForm("form");
     },
-    // 修改为设备管理员
     onChangeDeviceAdmin(val) {
       if (val) {
         this.$confirm('【高危操作】是否确认设置用户为设备管理员？<br/>用户将可以通过微信小程序注册设备！', {
@@ -162,3 +244,8 @@ export default {
   }
 }
 </script>
+<style scoped>
+.el-dialog__footer{
+  padding-top: 30px;
+}
+</style>
diff --git a/src/views/user/user/detail.vue b/src/views/user/user/detail.vue
index 49f34f8..386a546 100644
--- a/src/views/user/user/detail.vue
+++ b/src/views/user/user/detail.vue
@@ -39,11 +39,11 @@
             </template>
             <div class="user-detail">
               <div class="user-header">
-                <el-avatar :size="64" :src="detail.avatar"></el-avatar>
-                <el-row type="flex" class="name-box">
+                <img :src="userAvatar" alt="用户头像" class="user-avatar"/>
+                <div class="name-box">
                   <span class="user-name">{{ detail.userName }}</span>
                   <dict-tag :value="detail.userType" :options="dict.type.ss_user_type" style="margin-top: 4px;" />
-                </el-row>
+                </div>
                 <div class="phone-number">{{ detail.phonenumber }}</div>
               </div>
 
@@ -288,14 +288,14 @@ export default {
       reportActiveTab: 'daily',
       mainActiveTab: 'orders',
       statisticsData: [
-        { label: '店铺数', field: 'storeCount', icon: 'el-icon-office-building', color: 'blue', unit: '家' },
-        { label: '房间数', field: 'roomCount', icon: 'el-icon-house', color: 'pink', unit: '间' },
-        { label: '设施数', field: 'facilityCount', icon: 'el-icon-box', color: 'cyan', unit: '个' },
-        { label: '设备数', field: 'deviceCount', icon: 'el-icon-monitor', color: 'green', unit: '台' },
+        { label: '店铺数', field: 'storeNum', icon: 'el-icon-office-building', color: 'blue', unit: '家' },
+        { label: '房间数', field: 'roomNum', icon: 'el-icon-house', color: 'pink', unit: '间' },
+        { label: '设施数', field: 'equNum', icon: 'el-icon-box', color: 'cyan', unit: '个' },
+        { label: '设备数', field: 'deviceNum', icon: 'el-icon-monitor', color: 'green', unit: '台' },
         { label: '账户余额', field: 'balance', icon: 'el-icon-wallet', color: 'purple', isMoney: true },
         { label: '总收入', field: 'totalIncome', icon: 'el-icon-money', color: 'orange', isMoney: true },
         { label: '总提现', field: 'totalWithdrawAmount', icon: 'el-icon-bank-card', color: 'red', isMoney: true },
-        { label: '总消费', field: 'totalConsumption', icon: 'el-icon-shopping-cart-full', color: 'brown', isMoney: true }
+        { label: '总消费', field: 'totalConsume', icon: 'el-icon-shopping-cart-full', color: 'brown', isMoney: true }
       ],
 
       pickerOptions: {
@@ -340,7 +340,12 @@ export default {
         dividendProportion: [
           { required: true, message: "分红比例不能为空", trigger: "blur" }
         ]
-      }
+      },
+
+      userName: '',
+      phonenumber: '',
+      avatar: '', // 用户自定义头像
+      defaultAvatar: require('@/assets/icons/svg/user2.png') // 确保路径和文件名正确
     };
   },
   computed: {
@@ -351,6 +356,9 @@ export default {
       return (type) => {
         return type === '2' ? '元' : '%'
       }
+    },
+    userAvatar() {
+      return this.avatar || this.defaultAvatar;
     }
   },
   created() {
@@ -566,7 +574,7 @@ export default {
           }
         ]
       };
-      
+
       if (this.dailyChart) {
         this.dailyChart.setOption(option);
       }
@@ -662,7 +670,7 @@ export default {
           }
         ]
       };
-      
+
       if (this.monthlyChart) {
         this.monthlyChart.setOption(option);
       }
@@ -851,4 +859,11 @@ export default {
 .mb-2 {
   margin-bottom: 1rem;
 }
-</style>
\ No newline at end of file
+
+.user-avatar {
+  width: 100px;
+  height: 100px;
+  border-radius: 50%;
+  object-fit: cover;
+}
+</style>
diff --git a/src/views/user/user/index.vue b/src/views/user/user/index.vue
index c889288..6c882a3 100644
--- a/src/views/user/user/index.vue
+++ b/src/views/user/user/index.vue
@@ -117,8 +117,8 @@
           </el-table-column>
           <el-table-column label="是否管理员" align="center" prop="isAdmin">
             <template slot-scope="scope">
-              <el-tag size="small" :type="scope.row.isAdmin === 1 ? 'success' : 'info'">
-                {{ scope.row.isAdmin === 1 ? '是' : '否' }}
+              <el-tag size="small" :type="scope.row.deviceAdmin ? 'success' : 'info'">
+                {{ scope.row.deviceAdmin ? '是' : '否' }}
               </el-tag>
             </template>
           </el-table-column>
@@ -146,7 +146,7 @@
                   type="text"
                   icon="el-icon-view"
                   @click="handleView(scope.row)"
-                  v-hasPermi="['system:smUser:detail']"                
+                  v-hasPermi="['system:smUser:detail']"
                 >详情</el-button>
                 <el-button
                   size="mini"
@@ -185,7 +185,7 @@
     </el-row>
 
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
@@ -206,7 +206,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="用户类型" prop="userType"> 
+            <el-form-item label="用户类型" prop="userType">
               <el-select v-model="form.userType" placeholder="请选择用户类型">
                 <el-option
                   v-for="dict in filteredUserTypes"
@@ -238,45 +238,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="form.userType === '01'">
-          <el-col :span="12">
-            <el-form-item label="服务费率" prop="serviceFeeProportion">
-              <el-input-number
-                v-model="form.serviceFeeProportion"
-                :min="0"
-                :max="100"
-                :precision="2"
-                controls-position="right"
-              >
-                <template slot="append">%</template>
-              </el-input-number>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row v-if="form.userType === '05'">
-          <el-col :span="12">
-            <el-form-item label="分红状态" prop="dividendStatus">
-              <el-switch
-                v-model="form.dividendStatus"
-                active-value="0"
-                inactive-value="1"
-              ></el-switch>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="分红比例" prop="dividendProportion">
-              <el-input-number
-                v-model="form.dividendProportion"
-                :min="0"
-                :max="100"
-                :precision="2"
-                controls-position="right"
-              >
-                <template slot="append">%</template>
-              </el-input-number>
-            </el-form-item>
-          </el-col>
-        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -356,7 +317,6 @@
 <script>
 import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus,bandSystemUser } from "@/api/user/user";
 import { getToken } from "@/utils/auth";
-import { listUser as getSysUserList } from "@/api/system/user";
 import UserConfigDialog from '@/views/user/user/components/UserConfigDialog.vue';
 
 export default {
@@ -401,10 +361,6 @@ export default {
       dateRange: [],
       // 表单参数
       form: {},
-      defaultProps: {
-        children: "children",
-        label: "label"
-      },
       // 用户导入参数
       upload: {
         // 是否显示弹出层（用户导入）
@@ -459,9 +415,6 @@ export default {
         userType: [
           { required: true, message: "用户类型不能为空", trigger: "change" }
         ],
-        serviceFeeProportion: [
-          { required: true, message: "服务费率不能为空", trigger: "blur" }
-        ],
         dividendProportion: [
           { required: true, message: "分红比例不能为空", trigger: "blur" }
         ]
@@ -624,14 +577,9 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           const submitData = { ...this.form };
-          // 转换百分比为小数
-          if (submitData.userType === '01') { // 商户
-            submitData.serviceFeeProportion = submitData.serviceFeeProportion / 100;
+          if (submitData.userType !== '00') {
+            submitData.dividendProportion = submitData.dividendProportion / 100; // 转换为小数
           }
-          if (submitData.userType === '05') { // 合伙人
-            submitData.dividendProportion = submitData.dividendProportion / 100;
-          }
-
           if (submitData.userId != undefined) {
             updateUser(submitData).then(response => {
               this.$modal.msgSuccess("修改成功");