diff --git a/src/api/system/clean.js b/src/api/system/clean.js
index 04c4fcb..ab53abf 100644
--- a/src/api/system/clean.js
+++ b/src/api/system/clean.js
@@ -42,3 +42,15 @@ export function delClean(cleanId) {
     method: 'delete'
   })
 }
+
+
+// 完成保洁
+export function completeCleaning(data) {
+  return request({
+    url: '/app/clean/completeCleaning',
+    method: 'get',
+    params: {
+      cleanId: data.cleanId
+    }
+  })
+}
diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js
index d79b4d8..ef2ae14 100644
--- a/src/utils/ruoyi.js
+++ b/src/utils/ruoyi.js
@@ -236,9 +236,9 @@ export function generateCode(type) {
   console.log('generateCode', type)
   // 定义type与前缀的映射关系
   const prefixMap = {
-    '1': 'DP',
+    '1': 'D',
     '2': 'F',
-    '3': 'D',
+    '3': 'T',
     '4': 'W'
   };
 
diff --git a/src/views/system/clean/index.vue b/src/views/system/clean/index.vue
index b136467..1251dac 100644
--- a/src/views/system/clean/index.vue
+++ b/src/views/system/clean/index.vue
@@ -42,38 +42,38 @@
     </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:clean: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:clean: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:clean:remove']"
-        >删除</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['system:clean: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:clean: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:clean:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -136,17 +136,11 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            icon="el-icon-check"
+            v-if="scope.row.status === '1'"
+            @click="completeClean(scope.row)"
             v-hasPermi="['system:clean:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:clean:remove']"
-          >删除</el-button>
+          >完成保洁</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -219,7 +213,7 @@
 </template>
 
 <script>
-import { listClean, getClean, delClean, addClean, updateClean } from "@/api/system/clean";
+import {listClean, getClean, delClean, addClean, updateClean, completeCleaning} from "@/api/system/clean";
 import { $showColumns } from '@/utils/mixins';
 
 // 默认排序字段
@@ -243,7 +237,8 @@ export default {
         {key: 'roomName', visible: true, label: '房间名', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'status', visible: true, label: '状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'startTime', visible: true, label: '开始时间', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null},
-        {key: 'endTime', visible: true, label: '结束时间', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null},
+        // {key: 'endTime', visible: true, label: '结束时间', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null},
+        {key: 'actualEndTime', visible: true, label: '实际结束时间', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null},
         {key: 'remark', visible: true, label: '备注', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
       ],
       // 排序方式
@@ -294,6 +289,17 @@ export default {
     this.getList();
   },
   methods: {
+    completeClean(row){
+      const cleanId = row.cleanId || this.ids
+      this.$modal.confirm('确认完成保洁吗？').then(() => {
+        return completeCleaning({
+          cleanId: cleanId
+        });
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("操作成功");
+      }).catch(() => {});
+    },
     /** 查看商户详情 */
     merchantDetail(row) {
       if (!row.merchantId) {
diff --git a/src/views/system/commandLog/index.vue b/src/views/system/commandLog/index.vue
index 3cd3b54..bfd20b3 100644
--- a/src/views/system/commandLog/index.vue
+++ b/src/views/system/commandLog/index.vue
@@ -33,8 +33,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="IOT状态" prop="callStatus">
-        <el-select v-model="queryParams.callStatus" placeholder="请选择IOT状态" clearable>
+      <el-form-item label="IOT状态" prop="code">
+        <el-select v-model="queryParams.code" placeholder="请选择IOT状态" clearable>
           <el-option
             v-for="dict in dict.type.onenet_call_status"
             :key="dict.value"
@@ -69,11 +69,14 @@
             <template v-if="column.key === 'sn'">
               {{ d.row.sn || '--' }}
             </template>
-            <template v-else-if="column.key === 'callStatus'">
-              <dict-tag :options="dict.type.onenet_call_status" :value="d.row.callStatus"/>
+            <template v-else-if="column.key === 'code'">
+              <dict-tag :options="dict.type.onenet_call_status" :value="d.row.code"/>
             </template>
-            <template v-else-if="column.key === 'createTime'">
-              <span>{{ parseTime(d.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            <template v-else-if="column.key === 'type'">
+              <dict-tag :options="dict.type.command_log_type" :value="d.row.type"/>
+            </template>
+            <template v-else-if="column.key === 'operaTime'">
+              <span>{{ parseTime(d.row.operaTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
             </template>
             <template v-else>
               {{d.row[column.key]}}
@@ -109,7 +112,9 @@
           <el-form-item label="命令">{{ form.command }}</el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item style="color: #12d2ac;font-weight: 700" label="类型">{{ form.type }}</el-form-item>
+          <el-form-item label="类型">
+            <dict-tag :options="dict.type.command_log_type" :value="form.type"/>
+          </el-form-item>
         </el-col>
         <el-col :span="24">
           <el-form-item label="MAC">{{ form.mac }}</el-form-item>
@@ -122,14 +127,14 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="IOT状态">
-            <dict-tag :options="dict.type.onenet_call_status" :value="form.callStatus"/>
+            <dict-tag :options="dict.type.onenet_call_status" :value="form.code"/>
           </el-form-item>
         </el-col>
         <el-col :span="24">
           <el-form-item label="操作人">{{ form.userName }}</el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="创建时间">{{ parseTime(form.createTime) }}</el-form-item>
+          <el-form-item label="操作时间">{{ parseTime(form.operaTime) }}</el-form-item>
         </el-col>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -145,7 +150,7 @@ import { $showColumns } from '@/utils/mixins';
 
 export default {
   name: "CommandLog",
-  dicts:  ['onenet_call_status'],
+  dicts:  ['onenet_call_status','command_log_type'],
   mixins: [$showColumns],
   props:{
     query: {
@@ -198,12 +203,12 @@ export default {
         {key: 'mac', visible: true, label: 'MAC', minWidth: null, sortable: true, overflow: false, align: 'center'},
         {key: 'sn', visible: true, label: 'SN', minWidth: null, sortable: true, overflow: false, align: 'center'},
         {key: 'result', visible: true, label: '响应', minWidth: null, sortable: true, overflow: true, align: 'center'},
-        {key: 'callStatus', visible: true, label: 'IOT状态', minWidth: null, sortable: true, overflow: false, align: 'center'},
+        {key: 'code', visible: true, label: 'IOT状态', minWidth: null, sortable: true, overflow: false, align: 'center'},
         {key: 'userName', visible: true, label: '操作人', minWidth: null, sortable: true, overflow: false, align: 'center'},
-        {key: 'createTime', visible: true, label: '创建时间', minWidth: null, sortable: true, overflow: false, align: 'center'},
+        {key: 'operaTime', visible: true, label: '操作时间', minWidth: null, sortable: true, overflow: false, align: 'center'},
       ],
       // 默认排序字段
-      defaultSort: {prop: 'createTime', order: 'descending'},
+      defaultSort: {prop: 'operaTime', order: 'descending'},
       // 排序方式
       orderSorts: ['ascending', 'descending'],
     };
diff --git a/src/views/system/detail/index.vue b/src/views/system/detail/index.vue
index 6cbe662..23de1b1 100644
--- a/src/views/system/detail/index.vue
+++ b/src/views/system/detail/index.vue
@@ -68,8 +68,9 @@
                 {{d.row.partnerName}}
               </router-link>
             </template>
-            <template v-else-if="['totalAmount', 'dividendAmount', 'refundAmount'].includes(column.key)">
-              <span v-if="column.key === 'refundAmount'" style="color: red">{{d.row[column.key] | dv}} 元</span>
+            <template v-else-if="['totalAmount', 'dividendAmount', 'refundAmount','settlementAmount'].includes(column.key)">
+              <span v-if="column.key === 'refundAmount'" style="color: red;font-weight: bold;">{{d.row[column.key] | dv}} 元</span>
+              <span v-else-if="column.key === 'settlementAmount'" style="color: #13ce66;font-weight: bold;">{{d.row[column.key] | dv}} 元</span>
               <span v-else>{{d.row[column.key] | dv}}元 </span>
             </template>
             <template v-else-if="column.key === 'dividendProportion'">
@@ -195,6 +196,7 @@ export default {
         {key: 'totalAmount', visible: true, label: '总金额', sortable: true, align: 'center'},
         {key: 'dividendAmount', visible: true, label: '分账金额', sortable: true, align: 'center'},
         {key: 'refundAmount', visible: true, label: '退款金额', sortable: true, align: 'center'},
+        {key: 'settlementAmount', visible: true, label: '结算金额', sortable: true, align: 'center'},
         {key: 'createTime', visible: true, label: '创建时间', minWidth: '120', sortable: true, align: 'center'}
       ],
       // 排序方式
diff --git a/src/views/system/hallEqu/index.vue b/src/views/system/hallEqu/index.vue
index 94df1bd..aa404ab 100644
--- a/src/views/system/hallEqu/index.vue
+++ b/src/views/system/hallEqu/index.vue
@@ -368,6 +368,7 @@ export default {
         picture: undefined,
         pictures: [],
         tags: [],
+        code: '',
         ruleIds: [],
         specification: undefined,
         // billingMode: 'basePrice', // 默认计费方式
@@ -473,6 +474,7 @@ export default {
       this.form = {
         roomId: undefined,
         roomName: undefined,
+        code: '',
         storeId: this.query.storeId,
         merchantId: this.query.merchantId,
         type: undefined,
@@ -506,6 +508,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.handleMerchantChange(this.query.merchantId);
       this.open = true;
       this.title = "添加设施";
     },
diff --git a/src/views/system/order/order_detail.vue b/src/views/system/order/order_detail.vue
index 5af05f5..cec5282 100644
--- a/src/views/system/order/order_detail.vue
+++ b/src/views/system/order/order_detail.vue
@@ -143,7 +143,9 @@
                     <el-descriptions-item label="实付金额">{{ order.payFee | dv }} 元</el-descriptions-item>
                     <el-descriptions-item label="手续费">{{ order.handlingCharge | dv }} 元</el-descriptions-item>
                     <el-descriptions-item label="平台服务费">{{ order.platformServiceFee | dv }} 元</el-descriptions-item>
-                    <el-descriptions-item label="退款金额">{{ order.refund | dv }} 元</el-descriptions-item>
+                    <el-descriptions-item label="退款金额">
+                      <span style="color: red; font-weight: bold;">{{ order.refund | dv }} 元</span>
+                    </el-descriptions-item>
 <!--                    <el-descriptions-item label="扣除金额">{{ order.deductionAmount | dv }} 元</el-descriptions-item>-->
                   </el-descriptions>
                 </div>
@@ -154,7 +156,7 @@
             <!-- 右侧操作履历 -->
             <div class="detail-right">
               <div class="info-sections history-section">
-                <h3>
+                <h3 style="font-size: 16px">
                   <i class="el-icon-time" style="color: #E6A23C;"></i>
                   操作履历
                 </h3>
diff --git a/src/views/system/refund/index.vue b/src/views/system/refund/index.vue
index 15a5013..f39377e 100644
--- a/src/views/system/refund/index.vue
+++ b/src/views/system/refund/index.vue
@@ -43,22 +43,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="退款金额" prop="amount">
-        <el-input
-          v-model="queryParams.amount"
-          placeholder="请输入退款金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="退款结果" prop="refundResult">
-        <el-input
-          v-model="queryParams.refundResult"
-          placeholder="请输入退款结果"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="商户" prop="merchantId">
         <el-input
           v-model="queryParams.merchantId"
@@ -171,9 +155,9 @@
         <el-form-item label="退款原因" prop="reason">
           <el-input v-model="form.reason" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="退款结果" prop="refundResult">
-          <el-input v-model="form.refundResult" placeholder="请输入退款结果" />
-        </el-form-item>
+<!--        <el-form-item label="退款结果" prop="refundResult">-->
+<!--          <el-input v-model="form.refundResult" placeholder="请输入退款结果" />-->
+<!--        </el-form-item>-->
         <el-form-item label="商户" prop="merchantId">
           <el-input v-model="form.merchantId" placeholder="请输入商户" />
         </el-form-item>
@@ -219,7 +203,7 @@ export default {
         {key: 'status', visible: true, label: '状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'amount', visible: true, label: '退款金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'reason', visible: true, label: '退款原因', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'refundResult', visible: true, label: '退款结果', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        // {key: 'refundResult', visible: true, label: '退款结果', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         // {key: 'merchant', visible: true, label: '商户', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'operTime', visible: true, label: '操作时间', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null},
       ],
diff --git a/src/views/system/room/index.vue b/src/views/system/room/index.vue
index e7de724..2034cba 100644
--- a/src/views/system/room/index.vue
+++ b/src/views/system/room/index.vue
@@ -345,6 +345,7 @@ export default {
         type: null,
         type2: "1",
         hour: null,
+        code: '',
         picture: '',
         pictures: [],
         tags: [],
@@ -450,6 +451,7 @@ export default {
         merchantId: this.query.merchantId,
         type: null,
         type2: "1",
+        code: '',
         hour: null,
         picture: '',
         pictures: [],
@@ -491,6 +493,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.handleMerchantChange(this.query.merchantId);
       this.open = true;
       this.title = "添加房间";
     },
diff --git a/src/views/system/room/room_detail.vue b/src/views/system/room/room_detail.vue
index 0f817a5..769bb05 100644
--- a/src/views/system/room/room_detail.vue
+++ b/src/views/system/room/room_detail.vue
@@ -250,7 +250,7 @@
                   merchantId: room.merchantId
                 }" />
       </el-tab-pane>
-      <el-tab-pane label="设施列表" name="equipments" :lazy="true">
+      <el-tab-pane v-if="!isEquipment" label="设施列表" name="equipments" :lazy="true">
         <equipment :query="{
                   roomId: room.roomId,
                   storeId: Number(room.storeId),
@@ -413,17 +413,19 @@ export default {
         explain: undefined,
         mode: undefined
       },
-      isEquipment: false, // 是否为设施详情
     }
   },
-
+  computed: {
+    isEquipment() {
+      return this.$route.query.type === 'equipment';
+    }
+  },
   created() {
     this.handleRuleQuery()
     this.getDetail()
     this.getDictData()
     this.getStoreOptions()
     this.getDomain2()
-    this.isEquipment = this.$route.query.type === 'equipment';
   },
 
   methods: {
diff --git a/src/views/system/store/components/StoreForm.vue b/src/views/system/store/components/StoreForm.vue
index 6ae5f28..6eda881 100644
--- a/src/views/system/store/components/StoreForm.vue
+++ b/src/views/system/store/components/StoreForm.vue
@@ -2,8 +2,8 @@
   <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
     <el-form ref="form" :model="form" :rules="rules" label-width="80px">
       <el-col :span="12">
-        <el-form-item v-if="isAdmin" label="商户" prop="merchantId">
-          <el-select v-model="form.merchantId" filterable placeholder="请选择商户">
+        <el-form-item v-if="query.isAdmin" label="商户" prop="merchantId">
+          <el-select v-model="form.merchantId" filterable placeholder="请选择商户" :disabled="query.merchantId">
             <el-option
               v-for="merchant in merchantOptions"
               :key="merchant.userId"
@@ -143,13 +143,11 @@ export default {
       type: Boolean,
       default: false
     },
-    storeId: {
-      type: [String, Number],
-      default: null
-    },
-    isAdmin: {
-      type: Boolean,
-      default: false
+      query: {
+      type: Object,
+      default: () => {
+        return {}
+      }
     }
   },
   data() {
@@ -157,7 +155,7 @@ export default {
       open: this.visible,
       title: "",
       form: {
-        storeId: null,
+        storeId: this.query.storeId,
         name: null,
         contactName: null,
         contactMobile: null,
@@ -168,7 +166,7 @@ export default {
         lat: null,
         businessTimeStart: null,
         businessTimeEnd: null,
-        merchantId: null
+        merchantId: this.query.merchantId
       },
       merchantOptions: [],
       rules: {
@@ -195,7 +193,7 @@ export default {
       this.open = val;
       if (val) {
         this.reset();
-        if (this.storeId) {
+        if (this.query.storeId) {
           this.title = "修改店铺";
           this.getStoreInfo();
         } else {
@@ -220,7 +218,7 @@ export default {
       });
     },
     getStoreInfo() {
-      getStore(this.storeId).then(response => {
+      getStore(this.query.storeId).then(response => {
         this.form = response.data;
         // 处理图片
         if (!this.form.picture && Array.isArray(this.form.pictures) && this.form.pictures.length > 0) {
@@ -261,8 +259,9 @@ export default {
     },
     reset() {
       this.form = {
-        storeId: null,
+        storeId: this.query.storeId,
         name: null,
+        code: '',
         contactName: null,
         contactMobile: null,
         idcard: null,
@@ -272,7 +271,7 @@ export default {
         lat: null,
         businessTimeStart: null,
         businessTimeEnd: null,
-        merchantId: null
+        merchantId: this.query.merchantId
       };
       this.resetForm("form");
     }
diff --git a/src/views/system/store/index.vue b/src/views/system/store/index.vue
index fd88ec2..e5e8a28 100644
--- a/src/views/system/store/index.vue
+++ b/src/views/system/store/index.vue
@@ -232,8 +232,11 @@
     <!-- 添加或修改店铺对话框 -->
     <store-form
       :visible.sync="showStoreForm"
-      :store-id="currentStoreId"
-      :is-admin="isAdmin"
+      :query="{
+        merchantId: query.merchantId,
+        isAdmin: isAdmin,
+        storeId: currentStoreId
+      }"
       @success="handleFormSuccess"
       @cancel="handleFormCancel"
     />
@@ -658,6 +661,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.reset();
       this.currentStoreId= null
       this.showStoreForm = true;
     },
diff --git a/src/views/system/store/store_detail.vue b/src/views/system/store/store_detail.vue
index b7a7df6..93eb5a6 100644
--- a/src/views/system/store/store_detail.vue
+++ b/src/views/system/store/store_detail.vue
@@ -251,7 +251,7 @@
                 merchantId: storeData.merchantId
               }"/>
       </el-tab-pane>
-      <el-tab-pane label="设施列表" name="equipments" :lazy="true">
+      <el-tab-pane label="大厅设施" name="equipments" :lazy="true">
         <equipment :query="{
                 storeId: Number(storeId),
                 merchantId: storeData.merchantId
@@ -287,8 +287,11 @@
     <!-- 添加或修改店铺对话框 -->
     <store-form
       :visible.sync="showStoreForm"
-      :store-id="currentStoreId"
-      :is-admin="isAdmin"
+      :query="{
+        merchantId: storeData.merchantId,
+        isAdmin: isAdmin,
+        storeId: currentStoreId
+      }"
       @success="handleFormSuccess"
       @cancel="handleFormCancel"
     />
@@ -881,6 +884,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate() {
       this.currentStoreId = this.storeId;
+      console.log("this.currentStoreId----------"+this.currentStoreId)
       this.showStoreForm = true;
     },
   }
diff --git a/src/views/system/withdraw/index.vue b/src/views/system/withdraw/index.vue
index b753c63..e517634 100644
--- a/src/views/system/withdraw/index.vue
+++ b/src/views/system/withdraw/index.vue
@@ -69,9 +69,9 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table 
-      v-loading="loading" 
-      :data="withdrawList" 
+    <el-table
+      v-loading="loading"
+      :data="withdrawList"
       @selection-change="handleSelectionChange"
       :default-sort="defaultSort"
       @sort-change="onSortChange"
@@ -98,6 +98,11 @@
                 {{d.row[column.key]}}
               </router-link>
             </template>
+            <template v-else-if="column.key === 'amount'">
+               <span>
+                 {{d.row[column.key] || dv}}元
+               </span>
+            </template>
             <template v-else-if="column.key === 'createTime'">
               <span>{{ parseTime(d.row[column.key], '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
             </template>
diff --git a/src/views/user/user/components/UserConfigDialog.vue b/src/views/user/user/components/UserConfigDialog.vue
index d962ec4..4725741 100644
--- a/src/views/user/user/components/UserConfigDialog.vue
+++ b/src/views/user/user/components/UserConfigDialog.vue
@@ -26,6 +26,7 @@
           <el-input
             v-model.number="form.dividendProportion"
             type="number"
+            disabled
             :min="0"
             :max="100"
             :step="0.01"
diff --git a/src/views/user/user/detail.vue b/src/views/user/user/detail.vue
index 1f448d4..9170e32 100644
--- a/src/views/user/user/detail.vue
+++ b/src/views/user/user/detail.vue
@@ -34,9 +34,9 @@
                 <el-row type="flex" justify="end" >
                   <el-button v-if="detail.userType === '01'" type="text" icon="el-icon-plus" size="mini" @click="handleAddAccount"
                             v-hasPermi="['system:smUser:edit']">加账</el-button>
-                  <el-button v-if="detail.userType === '01'" type="text" icon="el-icon-minus" size="mini" @click="handleReduceAccount"
+                  <el-button v-if="detail.userType === '01' || detail.userType === '05'" type="text" icon="el-icon-minus" size="mini" @click="handleReduceAccount"
                              v-hasPermi="['system:smUser:edit']">减账</el-button>
-                  <el-button type="text" icon="el-icon-setting" size="mini" @click="handleUpdateRisk"
+                  <el-button v-if="detail.userType !== '00'" type="text" icon="el-icon-setting" size="mini" @click="handleUpdateRisk"
                              v-hasPermi="['system:smUser:edit']">配置</el-button>
                 </el-row>
               </div>
@@ -250,7 +250,7 @@
                   merchantId: detail.userId
                 }" />
       </el-tab-pane>
-      <el-tab-pane label="设施列表" name="equipments" :lazy="true">
+      <el-tab-pane label="大厅设施" name="equipments" :lazy="true">
         <equipment :query="{
                   merchantId: detail.userId
                 }" />
@@ -549,6 +549,7 @@ export default {
       this.loading = true;
       getUser(this.$route.params.userId, params).then(response => {
         this.detail = response.data;
+        this.detail.serviceFeeProportion = this.detail.serviceFeeProportion * 100;
         // 初始化收入趋势图表
         this.$nextTick(() => {
           this.initDailyChart();
diff --git a/src/views/user/user/index.vue b/src/views/user/user/index.vue
index 698bb65..9b92b70 100644
--- a/src/views/user/user/index.vue
+++ b/src/views/user/user/index.vue
@@ -148,24 +148,11 @@
                   @click="handleView(scope.row)"
                   v-hasPermi="['system:smUser:detail']"
                 >详情</el-button>
-<!--                <el-button-->
-<!--                  size="mini"-->
-<!--                  type="text"-->
-<!--                  icon="el-icon-edit"-->
-<!--                  @click="handleUpdate(scope.row)"-->
-<!--                  v-hasPermi="['system:smUser:edit']"-->
-<!--                >修改</el-button>-->
-<!--                <el-button-->
-<!--                  size="mini"-->
-<!--                  type="text"-->
-<!--                  icon="el-icon-delete"-->
-<!--                  @click="handleDelete(scope.row)"-->
-<!--                  v-hasPermi="['system:smUser:remove']"-->
-<!--                >删除</el-button>-->
                 <el-button
                   size="mini"
                   type="text"
                   icon="el-icon-setting"
+                  v-if="scope.row.userType !== '00'"
                   @click="handleUpdateRisk(scope.row)"
                   v-hasPermi="['system:smUser:edit']"
                 >配置</el-button>