diff --git a/src/api/system/room.js b/src/api/system/room.js
index f961d75..823ec42 100644
--- a/src/api/system/room.js
+++ b/src/api/system/room.js
@@ -81,7 +81,7 @@ export function openRoomGate(roomId) {
 // 房间设备全开/全关
 export function switchAllDevices(roomId, open) {
   return request({
-    url: `/app/device/adminAll/${roomId}/switch`,
+    url: `/app/device/admin/adminAll/${roomId}/switch`,
     method: 'post',
     params: {
       open: open
diff --git a/src/views/system/cardOrder/index.vue b/src/views/system/cardOrder/index.vue
index 35a4e9b..01ce326 100644
--- a/src/views/system/cardOrder/index.vue
+++ b/src/views/system/cardOrder/index.vue
@@ -9,122 +9,42 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="用户ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入用户ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="用户手机号" prop="phone">
-        <el-input
-          v-model="queryParams.phone"
-          placeholder="请输入用户手机号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="用户名" prop="userName">
+      <el-form-item label="用户" prop="userName">
         <el-input
           v-model="queryParams.userName"
-          placeholder="请输入用户名"
+          placeholder="请输入用户"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="真实姓名" prop="realName">
-        <el-input
-          v-model="queryParams.realName"
-          placeholder="请输入真实姓名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="支付时间" prop="payTime">
-        <el-date-picker clearable
-          v-model="queryParams.payTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择支付时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="支付状态:1-待支付，2-支付中，3-支付成功，4-已取消" prop="paid">
+      <el-form-item label="支付状态" prop="paid">
         <el-input
           v-model="queryParams.paid"
-          placeholder="请输入支付状态:1-待支付，2-支付中，3-支付成功，4-已取消"
+          placeholder="请输入支付状态"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="支付单id" prop="payId">
-        <el-input
-          v-model="queryParams.payId"
-          placeholder="请输入支付单id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="订单总金额" prop="totalFee">
-        <el-input
-          v-model="queryParams.totalFee"
-          placeholder="请输入订单总金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="实际支付金额" prop="payFee">
-        <el-input
-          v-model="queryParams.payFee"
-          placeholder="请输入实际支付金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="支付渠道id" prop="payChannel">
+      <el-form-item label="支付渠道" prop="payChannel">
         <el-input
           v-model="queryParams.payChannel"
-          placeholder="请输入支付渠道id"
+          placeholder="请输入支付渠道"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="渠道名称" prop="channelName">
-        <el-input
-          v-model="queryParams.channelName"
-          placeholder="请输入渠道名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="渠道成本" prop="channelCost">
-        <el-input
-          v-model="queryParams.channelCost"
-          placeholder="请输入渠道成本"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="商户id(用于隔离)" prop="merchantId">
+      <el-form-item label="商户" prop="merchantId">
         <el-input
           v-model="queryParams.merchantId"
-          placeholder="请输入商户id(用于隔离)"
+          placeholder="请输入商户"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="店铺id" prop="storeId">
+      <el-form-item label="店铺" prop="storeId">
         <el-input
           v-model="queryParams.storeId"
-          placeholder="请输入店铺id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="店铺名称" prop="storeName">
-        <el-input
-          v-model="queryParams.storeName"
-          placeholder="请输入店铺名称"
+          placeholder="请输入店铺"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -137,82 +57,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="限制次数：0-无限制；其他数字直接显示次数" prop="limitNum">
-        <el-input
-          v-model="queryParams.limitNum"
-          placeholder="请输入限制次数：0-无限制；其他数字直接显示次数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="储值金额" prop="storedAmount">
-        <el-input
-          v-model="queryParams.storedAmount"
-          placeholder="请输入储值金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="有效期的值" prop="validityValue">
-        <el-input
-          v-model="queryParams.validityValue"
-          placeholder="请输入有效期的值"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="有效期单位：day-天；week-周；month-月；quarter-季度；year-年" prop="validityUnit">
-        <el-input
-          v-model="queryParams.validityUnit"
-          placeholder="请输入有效期单位：day-天；week-周；month-月；quarter-季度；year-年"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="可用的房间id" prop="availableRooms">
-        <el-input
-          v-model="queryParams.availableRooms"
-          placeholder="请输入可用的房间id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="可使用周: 1、2、3、4、5、6" prop="availableWeek">
-        <el-input
-          v-model="queryParams.availableWeek"
-          placeholder="请输入可使用周: 1、2、3、4、5、6"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="可用时间结束" prop="availableTimeEnd">
-        <el-date-picker clearable
-          v-model="queryParams.availableTimeEnd"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择可用时间结束">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="可用时间开始" prop="availableTimeStart">
-        <el-date-picker clearable
-          v-model="queryParams.availableTimeStart"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择可用时间开始">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="抖音sKuid" prop="skuId">
+      <el-form-item label="skuId" prop="skuId">
         <el-input
           v-model="queryParams.skuId"
-          placeholder="请输入抖音sKuid"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="小时" prop="hours">
-        <el-input
-          v-model="queryParams.hours"
-          placeholder="请输入小时"
+          placeholder="请输入skuId"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -224,38 +72,6 @@
     </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:cardOrder: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:cardOrder: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:cardOrder:remove']"
-        >删除</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -293,24 +109,24 @@
           </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:cardOrder:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:cardOrder:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
+<!--      <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:cardOrder:edit']"-->
+<!--          >修改</el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['system:cardOrder:remove']"-->
+<!--          >删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -347,8 +163,8 @@
             placeholder="请选择支付时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="支付状态:1-待支付，2-支付中，3-支付成功，4-已取消" prop="paid">
-          <el-input v-model="form.paid" placeholder="请输入支付状态:1-待支付，2-支付中，3-支付成功，4-已取消" />
+        <el-form-item label="支付状态" prop="paid">
+          <el-input v-model="form.paid" placeholder="请输入支付状态" />
         </el-form-item>
         <el-form-item label="支付单id" prop="payId">
           <el-input v-model="form.payId" placeholder="请输入支付单id" />
@@ -371,8 +187,8 @@
         <el-form-item label="渠道成本" prop="channelCost">
           <el-input v-model="form.channelCost" placeholder="请输入渠道成本" />
         </el-form-item>
-        <el-form-item label="商户id(用于隔离)" prop="merchantId">
-          <el-input v-model="form.merchantId" placeholder="请输入商户id(用于隔离)" />
+        <el-form-item label="商户" prop="merchantId">
+          <el-input v-model="form.merchantId" placeholder="请输入商户" />
         </el-form-item>
         <el-form-item label="店铺id" prop="storeId">
           <el-input v-model="form.storeId" placeholder="请输入店铺id" />
@@ -383,8 +199,8 @@
         <el-form-item label="卡券名称" prop="cardName">
           <el-input v-model="form.cardName" placeholder="请输入卡券名称" />
         </el-form-item>
-        <el-form-item label="限制次数：0-无限制；其他数字直接显示次数" prop="limitNum">
-          <el-input v-model="form.limitNum" placeholder="请输入限制次数：0-无限制；其他数字直接显示次数" />
+        <el-form-item label="限制次数" prop="limitNum">
+          <el-input v-model="form.limitNum" placeholder="请输入限制次数" />
         </el-form-item>
         <el-form-item label="储值金额" prop="storedAmount">
           <el-input v-model="form.storedAmount" placeholder="请输入储值金额" />
@@ -392,14 +208,14 @@
         <el-form-item label="有效期的值" prop="validityValue">
           <el-input v-model="form.validityValue" placeholder="请输入有效期的值" />
         </el-form-item>
-        <el-form-item label="有效期单位：day-天；week-周；month-月；quarter-季度；year-年" prop="validityUnit">
-          <el-input v-model="form.validityUnit" placeholder="请输入有效期单位：day-天；week-周；month-月；quarter-季度；year-年" />
+        <el-form-item label="有效期单位" prop="validityUnit">
+          <el-input v-model="form.validityUnit" placeholder="请输入有效期单位" />
         </el-form-item>
         <el-form-item label="可用的房间id" prop="availableRooms">
           <el-input v-model="form.availableRooms" placeholder="请输入可用的房间id" />
         </el-form-item>
-        <el-form-item label="可使用周: 1、2、3、4、5、6" prop="availableWeek">
-          <el-input v-model="form.availableWeek" placeholder="请输入可使用周: 1、2、3、4、5、6" />
+        <el-form-item label="可使用周" prop="availableWeek">
+          <el-input v-model="form.availableWeek" placeholder="请输入可使用周" />
         </el-form-item>
         <el-form-item label="可用时间结束" prop="availableTimeEnd">
           <el-date-picker clearable
@@ -452,34 +268,34 @@ export default {
         {key: 'orderId', visible: true, label: '订单id', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'orderNo', visible: true, label: '订单号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'userId', visible: true, label: '用户ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'phone', visible: true, label: '用户手机号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'phone', visible: true, label: '手机号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'userName', visible: true, label: '用户名', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'realName', visible: true, label: '真实姓名', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'payTime', visible: true, label: '支付时间', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null},
-        {key: 'payType', visible: true, label: '支付方式：wx-微信，alipay-支付宝,sys-系统自动（免费骑行）', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'paid', visible: true, label: '支付状态:1-待支付，2-支付中，3-支付成功，4-已取消', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'payType', visible: true, label: '支付方式', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'paid', visible: true, label: '支付状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'payId', visible: true, label: '支付单id', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'type', visible: true, label: '订单类型：1-茶室订单;2-棋牌订单;3-台球订单;4-货柜订单', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'totalFee', visible: true, label: '订单总金额（元）', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'payFee', visible: true, label: '实际支付金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'type', visible: true, label: '订单类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'totalFee', visible: true, label: '总金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'payFee', visible: true, label: '实际支付', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'mark', visible: true, label: '备注', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'status', visible: true, label: '状态：0-待支付；1-支付中、2-待使用、3-使用中、4-已完成、5-超时自动取消、6-用户取消、7-退款中、8-已退款、9-用户结束订单', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'payChannel', visible: true, label: '支付渠道id', 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: 'payChannel', visible: true, label: '支付渠道', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'channelName', visible: true, label: '渠道名称', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'channelCost', visible: true, label: '渠道成本', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'merchantId', visible: true, label: '商户id(用于隔离)', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'merchantId', visible: true, label: '商户', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'storeId', visible: true, label: '店铺id', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'storeName', visible: true, label: '店铺名称', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'cardName', visible: true, label: '卡券名称', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'limitNum', visible: true, label: '限制次数：0-无限制；其他数字直接显示次数', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'limitNum', visible: true, label: '限制次数', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'storedAmount', visible: true, label: '储值金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'validityValue', visible: true, label: '有效期的值', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'validityUnit', visible: true, label: '有效期单位：day-天；week-周；month-月；quarter-季度；year-年', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'availableRooms', visible: true, label: '可用的房间id', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'availableWeek', visible: true, label: '可使用周: 1、2、3、4、5、6', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        // {key: 'validityValue', visible: true, label: '有效期值', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'validityUnit', visible: true, label: '有效期', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'availableRooms', visible: true, label: '可用房间', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'availableWeek', visible: true, label: '可使用周', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'availableTimeEnd', visible: true, label: '可用时间结束', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null},
         {key: 'availableTimeStart', visible: true, label: '可用时间开始', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null},
-        {key: 'skuId', visible: true, label: '抖音sKuid', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'skuId', visible: true, label: '第三方skuid', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'hours', visible: true, label: '小时', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
       ],
       // 排序方式
@@ -552,7 +368,7 @@ export default {
           { required: true, message: "用户ID不能为空", trigger: "blur" }
         ],
         paid: [
-          { required: true, message: "支付状态:1-待支付，2-支付中，3-支付成功，4-已取消不能为空", trigger: "blur" }
+          { required: true, message: "支付状态不能为空", trigger: "blur" }
         ],
         type: [
           { required: true, message: "订单类型：1-茶室订单;2-棋牌订单;3-台球订单;4-货柜订单不能为空", trigger: "change" }