diff --git a/src/api/mch/bill.js b/src/api/mch/bill.js
index 52fc4f8..7a1b8a6 100644
--- a/src/api/mch/bill.js
+++ b/src/api/mch/bill.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 商户查询充值记录统计
+// 商户查询订单统计
 export function mchCountBill(query) {
   return request({
     url: '/mch/bill/count',
@@ -8,3 +8,32 @@ export function mchCountBill(query) {
     params: query
   })
 }
+
+// 查询本人收款订单列表
+export function incomeBillList(query) {
+  return request({
+    url: '/app/bill/incomeList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 商户订单退款
+export function mchRefundBill(billId, refundAmount) {
+  return request({
+    url: '/app/bill/refund',
+    method: 'put',
+    data: {
+      billId,
+      refundAmount
+    }
+  })
+}
+
+// 商户获取订单详情
+export function mchGetBill(billId) {
+  return request({
+    url: `/mch/bill/${billId}`,
+    method: 'get',
+  })
+}
diff --git a/src/api/mch/device.js b/src/api/mch/device.js
index a467773..0fdba26 100644
--- a/src/api/mch/device.js
+++ b/src/api/mch/device.js
@@ -41,3 +41,27 @@ export function mchRefreshIot(deviceId) {
     method: 'get'
   })
 }
+
+// 商户增加时长
+export function mchAddTime(deviceId, amount) {
+  return request({
+    url: `/app/device/addTime/${deviceId}?amount=${amount}`,
+    method: 'put'
+  })
+}
+
+// 商户时长归零
+export function mchResetDevice(deviceId) {
+  return request({
+    url: `/app/device/${deviceId}/reset`,
+    method: 'put'
+  })
+}
+
+// 商户设备开关
+export function mchSwitchDevice(deviceId, status) {
+  return request({
+    url: `/app/device/${deviceId}/changePower?status=${status}`,
+    method: 'put'
+  })
+}
diff --git a/src/api/mch/refund.js b/src/api/mch/refund.js
new file mode 100644
index 0000000..e69de29
diff --git a/src/api/mch/store.js b/src/api/mch/store.js
index d4fdbc0..3209228 100644
--- a/src/api/mch/store.js
+++ b/src/api/mch/store.js
@@ -44,3 +44,11 @@ export function mchDelStore(data) {
     data
   })
 }
+
+// 商户查询店铺列表
+export function mchListStoreByIds(ids) {
+  return request({
+    url: `/mch/store/listByIds/${ids}`,
+    method: 'get',
+  })
+}
diff --git a/src/components/Business/Store/StoreDialog.vue b/src/components/Business/Store/StoreDialog.vue
index 7a431af..2e89305 100644
--- a/src/components/Business/Store/StoreDialog.vue
+++ b/src/components/Business/Store/StoreDialog.vue
@@ -25,13 +25,12 @@
     >
       <el-table-column align="center" type="selection" v-if="multiple"></el-table-column>
       <el-table-column label="#" type="index" align="center"></el-table-column>
-      <el-table-column label="ID" align="center" prop="storeId" width="50"></el-table-column>
-      <el-table-column label="商户图片" align="center" prop="picture" width="100">
+      <el-table-column label="店铺图片" align="center" prop="picture" width="100">
         <template slot-scope="scope">
           <image-preview :src="scope.row.picture" :width="50" :height="50"/>
         </template>
       </el-table-column>
-      <el-table-column label="店铺名称" align="center" prop="name"></el-table-column>
+      <el-table-column label="店铺名称" align="center" prop="name" width="200"></el-table-column>
       <el-table-column label="店铺地址" align="center">
         <template slot-scope="d">
           {{d.row.province}}{{d.row.city}}{{d.row.county}}{{d.row.address}}
@@ -53,6 +52,9 @@
 <script>
 import {clone} from "@/utils";
 import { listStore } from '@/api/ss/store'
+import { mapGetters } from 'vuex'
+import { UserType } from '@/utils/constants'
+import { mchListStore } from '@/api/mch/store'
 
 export default {
   name: "StoreDialog",
@@ -97,20 +99,37 @@ export default {
       selected: [],
     }
   },
+  computed: {
+    ...mapGetters(['userType'])
+  },
   methods: {
     // 获取数据列表
     searchList() {
       this.loadTable = true;
-      listStore(this.searchForm).then(response => {
-        this.tableData = response.rows;
-        this.total = response.total;
-        // 刷新表格状态
-        this.$nextTick(()=>{
-          this.refreshTableSelection();
+
+      if (this.userType === UserType.APP) {
+        mchListStore().then(response => {
+          this.tableData = response.rows;
+          this.total = response.total;
+          // 刷新表格状态
+          this.$nextTick(()=>{
+            this.refreshTableSelection();
+          })
+        }).finally(() =>{
+          this.loadTable = false;
         })
-      }).finally(() =>{
-        this.loadTable = false;
-      })
+      } else {
+        listStore.then(response => {
+          this.tableData = response.rows;
+          this.total = response.total;
+          // 刷新表格状态
+          this.$nextTick(()=>{
+            this.refreshTableSelection();
+          })
+        }).finally(() =>{
+          this.loadTable = false;
+        })
+      }
     },
     // 打开时
     open() {
diff --git a/src/components/Business/Store/StoreInput.vue b/src/components/Business/Store/StoreInput.vue
index f3a3df3..b07320e 100644
--- a/src/components/Business/Store/StoreInput.vue
+++ b/src/components/Business/Store/StoreInput.vue
@@ -37,6 +37,9 @@
 import {isDeepEqual} from "@/utils";
 import StoreDialog from '@/components/Business/Store/StoreDialog.vue'
 import { listStoreByIds } from '@/api/ss/store'
+import { mapGetters } from 'vuex'
+import { UserType } from '@/utils/constants'
+import { mchListStoreByIds } from '@/api/mch/store'
 
 export default {
   name: 'StoreInput',
@@ -115,6 +118,7 @@ export default {
     }
   },
   computed: {
+    ...mapGetters(['userType']),
     // 显示绑定的值
     inputBindValue() {
       if (this.selected == null || this.selected.length === 0) {
@@ -146,9 +150,15 @@ export default {
     },
     // 加载选中值
     doLoad(ids) {
-      listStoreByIds(ids).then(res => {
-        this.selected = res.data;
-      })
+      if (this.userType === UserType.APP) {
+        mchListStoreByIds(ids).then(res => {
+          this.selected = res.data;
+        })
+      } else {
+        listStoreByIds(ids).then(res => {
+          this.selected = res.data;
+        })
+      }
     },
     // 修改值
     inputValue(val){
diff --git a/src/router/mch.js b/src/router/mch.js
index 87143be..606b16f 100644
--- a/src/router/mch.js
+++ b/src/router/mch.js
@@ -87,12 +87,22 @@ export const mchRoutes = [
     children: [
       {
         path: '',
-        component: () => import('@/views/index.vue'),
+        component: () => import('@/views/mch/bill'),
         hidden: false,
-        name: "MyBill",
+        name: "MchBill",
         meta: {
           noCache: false,
-          title: '套餐订单',
+          title: '充值订单',
+        }
+      },
+      {
+        path: ':billId',
+        component: () => import('@/views/mch/bill/detail.vue'),
+        hidden: true,
+        name: "MchBillDetail",
+        meta: {
+          noCache: false,
+          title: '订单详情',
         }
       },
     ]
diff --git a/src/store/getters.js b/src/store/getters.js
index e4cfa69..d1ce040 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -9,6 +9,7 @@ const getters = {
   avatar: state => state.user.avatar,
   name: state => state.user.name,
   userType: state => state.user.userType,
+  userId: state => state.user.id,
   title: state => state.user.title,
   introduction: state => state.user.introduction,
   roles: state => state.user.roles,
diff --git a/src/views/mch/bill/detail.vue b/src/views/mch/bill/detail.vue
new file mode 100644
index 0000000..86766a6
--- /dev/null
+++ b/src/views/mch/bill/detail.vue
@@ -0,0 +1,126 @@
+<template>
+  <div class="app-container" v-loading="loading">
+    <el-card class="box-card">
+      <el-descriptions title="基本信息">
+        <el-descriptions-item label="订单编号">{{detail.billNo | defaultValue}}</el-descriptions-item>
+        <el-descriptions-item label="交易状态" :span="2">
+          <dict-tag :value="detail.status" :options="dict.type.sm_transaction_bill_status" size="small"/>
+        </el-descriptions-item>
+        <el-descriptions-item label="交易金额">{{detail.money | money | defaultValue}} 元</el-descriptions-item>
+        <el-descriptions-item label="到账金额">{{detail.arrivalAmount | money | defaultValue}} 元</el-descriptions-item>
+        <el-descriptions-item label="手续费">{{detail.serviceCharge | money | defaultValue}} 元</el-descriptions-item>
+      </el-descriptions>
+    </el-card>
+    <el-card class="box-card">
+      <el-descriptions title="设备套餐信息">
+        <el-descriptions-item label="设备编号">
+          <device-link :id="detail.deviceId" :text="detail.deviceNo"/>
+        </el-descriptions-item>
+        <el-descriptions-item label="设备名称">
+          <device-link :id="detail.deviceId" :text="detail.deviceName"/>
+        </el-descriptions-item>
+        <el-descriptions-item label="设备充值状态">
+          <dict-tag :value="detail.deviceRechargeStatus" :options="dict.type.sm_transaction_bill_device_recharge_status" size="small"/>
+        </el-descriptions-item>
+        <el-descriptions-item label="套餐名称">{{detail.suitName | defaultValue}}</el-descriptions-item>
+        <el-descriptions-item label="套餐时长">{{detail.suitTime | defaultValue}} {{suitTimeUnit(detail.suitTimeUnit)}}</el-descriptions-item>
+        <el-descriptions-item label="套餐使用状态">
+          <el-tag size="small" :type="suitUsingType[suitStatus]">{{suitUsingText[suitStatus]}}</el-tag>
+        </el-descriptions-item>
+        <el-descriptions-item label="套餐开始时间">{{detail.suitStartTime | defaultValue}}</el-descriptions-item>
+        <el-descriptions-item label="套餐结束时间">{{detail.suitEndTime | defaultValue}}</el-descriptions-item>
+        <el-descriptions-item label="套餐失效时间">{{detail.suitExpireTime | defaultValue}}</el-descriptions-item>
+      </el-descriptions>
+    </el-card>
+
+    <el-card class="box-card">
+      <el-descriptions title="支付方信息">
+        <el-descriptions-item label="用户名称">{{detail.userName | defaultValue}}</el-descriptions-item>
+        <el-descriptions-item label="支付方式">
+          <dict-tag :value="detail.channelId" :options="dict.type.sm_transaction_bill_pay_type" size="small"/>
+        </el-descriptions-item>
+        <el-descriptions-item label="支付时间">{{detail.payTime | defaultValue}}</el-descriptions-item>
+      </el-descriptions>
+    </el-card>
+
+    <el-card class="box-card">
+      <el-descriptions title="收款方信息">
+        <el-descriptions-item label="收款人">{{detail.mchName | defaultValue}}</el-descriptions-item>
+        <el-descriptions-item label="收款人手机号">{{detail.mchMobile | defaultValue}}</el-descriptions-item>
+        <el-descriptions-item label="店铺名称">{{detail.storeName | defaultValue}}</el-descriptions-item>
+        <el-descriptions-item label="店铺地址">{{detail.storeAddress | defaultValue}}</el-descriptions-item>
+      </el-descriptions>
+    </el-card>
+
+    <el-card class="box-card">
+      <el-tabs>
+        <el-tab-pane label="退款信息" lazy>
+          <div style="padding: 16px 20px 0;">
+            <el-descriptions>
+              <el-descriptions-item label="总计退款金额">{{detail.refundAmount | money | defaultValue}} 元</el-descriptions-item>
+              <el-descriptions-item label="商户总计退款金额">{{detail.refundMchAmount | money | defaultValue}} 元</el-descriptions-item>
+              <el-descriptions-item label="服务费总计退款金额">{{detail.refundServiceAmount | money | defaultValue}} 元</el-descriptions-item>
+            </el-descriptions>
+          </div>
+          <refund v-if="detail.billId != null" :query="{billId: detail.billId}"/>
+        </el-tab-pane>
+      </el-tabs>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { getBill } from '@/api/system/recharge'
+import Refund from '@/views/ss/refund/index.vue'
+import { findLabel } from '@/utils'
+import { mchGetBill } from '@/api/mch/bill'
+import DeviceLink from '@/components/Business/Device/DeviceLink.vue'
+
+export default {
+  name: 'MchBillDetail',
+  components: { DeviceLink, Refund },
+  dicts: ['sm_transaction_bill_pay_type','sm_transaction_bill_status', 'sm_transaction_bill_device_recharge_status', 'time_unit'],
+  computed: {
+    // 时长单位
+    suitTimeUnit() {
+      return (unit) => {
+        return findLabel(this.dict.type.time_unit, unit);
+      }
+    },
+    // 套餐状态
+    suitStatus() {
+      if (this.detail.billId == null) {
+        return 0;
+      }
+      let now = new Date().getTime();
+      if (now < new Date(this.detail.suitStartTime).getTime()) {
+        return 1;
+      } else if (now < new Date(this.detail.suitEndTime).getTime()) {
+        return 2;
+      } else {
+        return 3;
+      }
+    },
+  },
+  data() {
+    return {
+      loading: false,
+      detail: {},
+      id: null,
+      suitUsingType: ['info', 'warning', 'success', 'danger'],
+      suitUsingText: ['未知', '未生效', '使用中', '已失效']
+    }
+  },
+  created() {
+    this.id = this.$route.params.billId;
+    this.getDetail();
+  },
+  methods: {
+    getDetail() {
+      mchGetBill(this.id).then(res => {
+        this.detail = res.data;
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/mch/bill/index.vue b/src/views/mch/bill/index.vue
new file mode 100644
index 0000000..f2c9199
--- /dev/null
+++ b/src/views/mch/bill/index.vue
@@ -0,0 +1,373 @@
+<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="userName">
+        <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入用户名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备名称" prop="deviceId">
+        <el-input
+          v-model="queryParams.deviceName"
+          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="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['system:bill:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="billList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="订单编号" align="center" prop="billNo" min-width="130">
+        <recharge-link slot-scope="d" :bill-id="d.row.billId" :text="d.row.billNo"/>
+      </el-table-column>
+      <el-table-column label="充值用户" align="center" prop="userName" />
+      <el-table-column label="设备" align="center" prop="deviceName" >
+        <device-link slot-scope="d" :id="d.row.deviceId" :text="d.row.deviceName"/>
+      </el-table-column>
+      <el-table-column label="交易金额" align="center">
+        <template slot-scope="d">
+          {{d.row.money | money}} 元
+        </template>
+      </el-table-column>
+      <el-table-column label="到账金额" align="center">
+        <template slot-scope="d">
+          {{d.row.arrivalAmount | money}} 元
+        </template>
+      </el-table-column>
+      <el-table-column label="手续费" align="center">
+        <template slot-scope="d">
+          {{d.row.serviceCharge | money}} 元
+        </template>
+      </el-table-column>
+      <el-table-column label="支付方式" align="center">
+        <template slot-scope="d">
+          <dict-tag :value="d.row.channelId" :options="dict.type.sm_transaction_bill_pay_type"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="交易状态" align="center">
+        <template slot-scope="d">
+          <dict-tag :value="d.row.status" :options="dict.type.sm_transaction_bill_status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="设备充值状态" align="center">
+        <template slot-scope="d">
+          <dict-tag :value="d.row.deviceRechargeStatus" :options="dict.type.sm_transaction_bill_device_recharge_status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="时间" align="center" prop="createTime" width="180"/>
+      <el-table-column label="操作" align="center" fixed="right">
+        <template slot-scope="d">
+          <el-button
+            size="small"
+            type="text"
+            icon="el-icon-view"
+            @click="handleView(d.row)"
+          >详情</el-button>
+          <el-button
+            size="small"
+            type="text"
+            icon="el-icon-refresh"
+            @click="refreshPayResult([d.row.billId])"
+            v-if="canRefresh(d.row)"
+          >刷新支付结果</el-button>
+          <el-button
+            size="small"
+            type="text"
+            icon="el-icon-refresh"
+            @click="rechargeDevice(d.row.billId)"
+            v-if="canRechargeDevice(d.row)"
+          >手动设备充值</el-button>
+          <el-button
+            size="small"
+            type="text"
+            icon="el-icon-refresh"
+            @click="handleRefund(d.row)"
+            v-show="canRefund(d.row)"
+          >订单退款</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>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 退款 -->
+    <el-dialog :visible.sync="showRefund" title="退款" width="400px">
+      <el-form :model="refundForm" :rules="refundRules">
+        <el-form-item label="退款金额" prop="refundAmount">
+          <el-input-number v-model="refundForm.refundAmount" placeholder="请输入退款金额" /> 元
+        </el-form-item>
+      </el-form>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitRefund" :loading="refundLoading">确 定</el-button>
+        <el-button @click="showRefund = false" >取 消</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import {
+  getBill,
+  delBill,
+  addBill,
+  updateBill,
+  refreshPayResult,
+  rechargeDevice
+} from '@/api/system/recharge'
+import UserLink from '@/components/Business/SmUser/UserLink.vue'
+import DeviceLink from '@/components/Business/Device/DeviceLink.vue'
+import RechargeLink from '@/components/Business/Transaction/RechargeLink.vue'
+import { incomeBillList, mchRefundBill } from '@/api/mch/bill'
+
+export default {
+  name: "MchBill",
+  components: { RechargeLink, DeviceLink, UserLink },
+  dicts: ['sm_transaction_bill_pay_type','sm_transaction_bill_status', 'sm_transaction_bill_device_recharge_status'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 充值记录表格数据
+      billList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userName: null,
+        deviceName: null,
+        landlordName: null,
+        type: "1",  // 充值
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      refundRules: {
+        refundAmount: [
+          { required: true, type: 'number', message: "退款金额不能为空", trigger: "blur" }
+        ]
+      },
+      showRefund: false,
+      refundForm: {},
+      refundLoading: false,
+    };
+  },
+  computed: {
+    canRefresh() {
+      return (row) => {
+        return row.status === '0' || row.status === '6';
+      }
+    },
+    canRechargeDevice() {
+      return (row) => {
+        return row.status === '2' && row.deviceRechargeStatus !== '1';
+      }
+    },
+    canRefund() {
+      return (row) => {
+        return row.status === '2' && row.money > 0;
+      }
+    }
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    submitRefund() {
+      this.refundLoading = true;
+      mchRefundBill(this.refundForm.billId, this.refundForm.refundAmount).then(res => {
+        if (res.code === 200) {
+          this.$message.success("操作成功");
+          this.showRefund = false;
+          this.getList();
+        }
+      }).finally(() => {
+        this.refundLoading = false;
+      })
+    },
+    handleView(row) {
+      this.$router.push(`/bill/${row.billId}`)
+    },
+    handleRefund(row) {
+      this.refundForm = {
+        billId: row.billId,
+        refundAmount: row.money,
+      }
+      this.showRefund = true;
+    },
+    rechargeDevice(id) {
+      rechargeDevice(id).then(res => {
+        if (res.code === 200) {
+          this.getList();
+          this.$message.success("操作成功");
+        } else {
+          this.$message.error(res.msg);
+        }
+      })
+    },
+    refreshPayResult(ids) {
+      refreshPayResult(ids).then(res => {
+        if (res.code === 200) {
+          this.getList();
+          this.$message.success("刷新成功");
+        } else {
+          this.$message.error(res.msg);
+        }
+      })
+    },
+    /** 查询充值记录列表 */
+    getList() {
+      this.loading = true;
+      incomeBillList(this.queryParams).then(response => {
+        this.billList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        billId: null,
+        userId: null,
+        type: null,
+        deviceId: null,
+        landlordId: null,
+        money: null,
+        arrivalAmount: null,
+        serviceCharge: 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.billId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加充值记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const billId = row.billId || this.ids
+      getBill(billId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改充值记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.billId != null) {
+            updateBill(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addBill(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const billIds = row.billId || this.ids;
+      this.$modal.confirm('是否确认删除充值记录编号为"' + billIds + '"的数据项？').then(function() {
+        return delBill(billIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/bill/export', {
+        ...this.queryParams
+      }, `bill_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/src/views/mch/device/components/bindRecord.vue b/src/views/mch/device/components/bindRecord.vue
deleted file mode 100644
index 1d5a05e..0000000
--- a/src/views/mch/device/components/bindRecord.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-<template>
-  <div>
-    <el-table v-loading="loading" :data="recordList">
-      <el-table-column align="center" type="index" label="#"></el-table-column>
-      <el-table-column align="center" label="时间" prop="createTime"></el-table-column>
-      <el-table-column align="center" label="用户名称" prop="userName"></el-table-column>
-    </el-table>
-
-    <pagination
-      :auto-scroll="false"
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getRecordList"
-    />
-  </div>
-</template>
-
-<script>
-import {listBindRecord} from "@/api/system/bindRecord";
-
-export default {
-  name: 'bindRecord',
-  props: {
-    // 设备id
-    deviceId: {
-      type: String,
-      default: null
-    }
-  },
-  data() {
-    return {
-      recordList: [], // 记录列表
-      loading: false,
-      total: 0,
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        deviceId: null,
-      }
-    }
-  },
-  watch: {
-    deviceId(nv, ov) {
-      this.getRecordList(nv);
-    }
-  },
-  created() {
-    this.getRecordList(this.deviceId);
-  },
-  methods: {
-    // 获取记录列表
-    getRecordList(deviceId) {
-      if(deviceId == null) {
-        this.recordList = [];
-        this.total = 0;
-        return;
-      }
-      this.loading = true;
-      this.queryParams.deviceId = deviceId | this.deviceId;
-      listBindRecord(this.queryParams).then(response => {
-        this.recordList = response.rows;
-        this.total = response.total;
-      }).finally(() => {
-        this.loading = false;
-      });
-    }
-  }
-}
-</script>
diff --git a/src/views/mch/device/components/meterRecordReport.vue b/src/views/mch/device/components/meterRecordReport.vue
deleted file mode 100644
index 459f03e..0000000
--- a/src/views/mch/device/components/meterRecordReport.vue
+++ /dev/null
@@ -1,153 +0,0 @@
-<template>
-  <div>
-    <el-row type="flex">
-      <el-tabs v-model="queryParams.groupBy" style="width: 100%" >
-        <el-tab-pane label="日报表" name="create_date">
-          <el-row type="flex">
-            <el-col :span="16">
-              <range-picker :end="new Date().getFullYear()" v-model="queryParams.year" @change="onChangeYear" suffix="年" />
-              <range-picker :start='1' :end="reportMonthEnd" v-model="queryParams.month" @change="onChangeMonth" suffix="月"/>
-            </el-col>
-            <el-col  :span="8" class="used">
-              本月用电量（度）
-              <span class="used-num">{{groupTotalUsed | money}}</span>
-            </el-col>
-          </el-row>
-        </el-tab-pane>
-        <el-tab-pane label="月报表" name="create_month">
-          <el-row type="flex">
-            <el-col :span="16">
-              <range-picker :end="new Date().getFullYear()" v-model="queryParams.year" @change="onChangeYear" suffix="年"/>
-            </el-col>
-            <el-col :span="8" class="used">
-              本年用电量（度）
-              <span class="used-num">{{groupTotalUsed | money}}</span>
-            </el-col>
-          </el-row>
-        </el-tab-pane>
-      </el-tabs>
-    </el-row>
-
-    <single-line-chart v-if="records && records.length > 0" v-loading="loading" :labels="labels" :chart-data="chartData" name="用电量" />
-    <el-empty v-else description="暂无数据" />
-  </div>
-</template>
-
-<script>
-import SingleLineChart from "@/components/SingleLineChart/index.vue";
-import {listCountRecord,} from "@/api/system/record";
-import RangePicker from "@/components/RangePicker/index.vue";
-
-export default {
-  name: 'meterRecordReport',
-  components: {RangePicker, SingleLineChart},
-  props: {
-    // 设备id
-    deviceId: {
-      type: String,
-      default: null,
-    }
-  },
-  data() {
-    return {
-      loading: false,
-      records: [],  // 记录列表
-      queryParams: {
-        year: new Date().getFullYear(),
-        month: new Date().getMonth() + 1,
-        groupBy: "create_date",
-      }
-    }
-  },
-  watch: {
-    deviceId(nv, ov) {
-      this.getReportData(nv);
-    },
-    "queryParams.groupBy": {
-      handler(nv, ov) {
-        if (nv === 'create_month') {  // 月报表
-          this.queryParams.month = null;
-        }
-        if (nv === 'create_date') {// 日报表
-          this.queryParams.month = new Date().getMonth() + 1;
-        }
-        this.getReportData(this.deviceId);
-      }
-    }
-  },
-  computed: {
-    labels() {
-      if (this.queryParams.groupBy === 'create_date') {
-        return this.records.map(item => item.createDate);
-      } else if (this.queryParams.groupBy === 'create_month') {
-        return this.records.map(item => item.createMonth + '月');
-      }
-      return [];
-    },
-    chartData() {
-      return this.records.map(item => item.groupUsedElectriQuantity);
-    },
-    // 每组的总用电量
-    groupTotalUsed() {
-      let sum = 0;
-      this.records.forEach(item => sum += item.groupUsedElectriQuantity);
-      return sum;
-    },
-    // 获取报表显示的月份
-    reportMonthEnd() {
-      let now = new Date();
-      let nowYear = new Date().getFullYear()
-      let paramYear = this.queryParams.year;
-      if (paramYear < nowYear) {
-        return 12;
-      }
-      if (paramYear === nowYear) {
-        return now.getMonth() + 1;
-      }
-      return 0;
-    },
-  },
-  created() {
-    this.getReportData(this.deviceId);
-  },
-  methods: {
-    // 切换月份
-    onChangeMonth(month) {
-      this.queryParams.month = month;
-      this.getReportData(this.deviceId);
-    },
-    // 切换年份
-    onChangeYear(year) {
-      this.queryParams.year = year;
-      let now = new Date();
-      if (year === now.getFullYear()) {
-        if (this.queryParams.month > now.getMonth() + 1) {
-          this.queryParams.month = new Date().getMonth() + 1;
-        }
-      }
-      this.getReportData(this.deviceId);
-    },
-    // 获取报表信息
-    getReportData(deviceId) {
-      this.loading = true;
-      this.queryParams.deviceId = deviceId | this.deviceId;
-      listCountRecord(this.queryParams).then(response => {
-        this.records = response.data;
-      }).finally(() => {
-        this.loading = false;
-      })
-    },
-  }
-}
-</script>
-
-<style scoped type="scss">
-.used {
-  line-height: 36px;
-  text-align: right;
-}
-.used-num {
-  font-size: 24px;
-  font-weight: bold;
-}
-</style>
diff --git a/src/views/mch/device/components/readingRecord.vue b/src/views/mch/device/components/readingRecord.vue
deleted file mode 100644
index a93c389..0000000
--- a/src/views/mch/device/components/readingRecord.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<template>
-  <div>
-    <el-table v-loading="loading" :data="tableData">
-      <el-table-column align="center" type="index" label="#"></el-table-column>
-      <el-table-column align="center" label="时间" prop="createTime"></el-table-column>
-      <el-table-column align="center" label="总用电量" prop="totalElectriQuantity">
-        <template slot-scope="d">{{d.row.totalElectriQuantity | money}} 度</template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      :auto-scroll="false"
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getChargeList"
-    />
-  </div>
-</template>
-
-<script>
-
-import {listRecord} from "@/api/system/record";
-
-export default {
-  name: 'readingRecord',
-  props: {
-    // 设备id
-    deviceId: {
-      type: String,
-      default: null
-    }
-  },
-  data() {
-    return {
-      tableData: [], // 列表
-      loading: false,
-      total: 0,
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        type: 1,
-        deviceId: null,
-      }
-    }
-  },
-  watch: {
-    deviceId(nv, ov) {
-      this.getChargeList(nv);
-    }
-  },
-  created() {
-    this.getChargeList(this.deviceId);
-  },
-  methods: {
-    // 获取充值记录
-    getChargeList(deviceId) {
-      if(deviceId == null) {
-        this.recordList = [];
-        this.total = 0;
-        return;
-      }
-      this.loading = true;
-      this.queryParams.deviceId = deviceId | this.deviceId;
-      listRecord(this.queryParams).then(response => {
-        this.tableData = response.rows;
-        this.total = response.total;
-      }).finally(() => {
-        this.loading = false;
-      });
-    }
-  }
-}
-</script>
diff --git a/src/views/mch/device/components/rechargeRecord.vue b/src/views/mch/device/components/rechargeRecord.vue
deleted file mode 100644
index d1e9776..0000000
--- a/src/views/mch/device/components/rechargeRecord.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-<template>
-  <div>
-    <el-table v-loading="loading" :data="rechargeList">
-      <el-table-column align="center" type="index" label="#"></el-table-column>
-      <el-table-column align="center" label="时间" prop="createTime"></el-table-column>
-      <el-table-column align="center" label="充值用户" prop="userName"></el-table-column>
-      <el-table-column align="center" label="套餐名称" prop="suitName"></el-table-column>
-      <el-table-column align="center" label="金额" prop="money">
-        <template slot-scope="d">{{d.row.money | money}} 元</template>
-      </el-table-column>
-      <el-table-column align="center" label="时长">
-        <template slot-scope="d">
-          <span>{{d.row.suitTime}} {{suitTimeUnit(d.row.suitTimeUnit)}}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      :auto-scroll="false"
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getChargeList"
-    />
-  </div>
-</template>
-
-<script>
-import {listBill} from "@/api/system/recharge";
-import { findLabel } from '@/utils'
-
-export default {
-  name: 'rechargeRecord',
-  dicts: ['time_unit'],
-  props: {
-    // 设备id
-    deviceId: {
-      type: String,
-      default: null
-    }
-  },
-  data() {
-    return {
-      rechargeList: [], // 充值记录列表
-      loading: false,
-      total: 0,
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        type: 1,
-        deviceId: null,
-      }
-    }
-  },
-  computed: {
-    // 时长单位
-    suitTimeUnit() {
-      return (unit) => {
-        return findLabel(this.dict.type.time_unit, unit);
-      }
-    }
-  },
-  watch: {
-    deviceId(nv, ov) {
-      this.getChargeList(nv);
-    }
-  },
-  created() {
-    this.getChargeList(this.deviceId);
-  },
-  methods: {
-    // 获取充值记录
-    getChargeList(deviceId) {
-      if(deviceId == null) {
-        this.recordList = [];
-        this.total = 0;
-        return;
-      }
-      this.loading = true;
-      this.queryParams.deviceId = deviceId | this.deviceId;
-      listBill(this.queryParams).then(response => {
-        this.rechargeList = response.rows;
-        this.total = response.total;
-      }).finally(() => {
-        this.loading = false;
-      });
-    }
-  }
-}
-</script>
diff --git a/src/views/mch/device/components/resetRecord.vue b/src/views/mch/device/components/resetRecord.vue
deleted file mode 100644
index cb8acf0..0000000
--- a/src/views/mch/device/components/resetRecord.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-<template>
-  <div>
-    <el-table v-loading="loading" :data="recordList">
-      <el-table-column align="center" type="index" label="#"></el-table-column>
-      <el-table-column align="center" label="时间" prop="createTime"></el-table-column>
-      <el-table-column align="center" label="商户名称" prop="mchName"></el-table-column>
-      <el-table-column align="center" label="归零前剩余时长" prop="surplusTime">
-        <template slot-scope="d">{{d.row.surplusTime | money}} 分钟</template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      :auto-scroll="false"
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getRecordList"
-    />
-  </div>
-</template>
-
-<script>
-import {listResetRecord} from "@/api/system/resetRecord";
-
-export default {
-  name: 'resetRecord',
-  props: {
-    // 设备id
-    deviceId: {
-      type: String,
-      default: null
-    }
-  },
-  data() {
-    return {
-      recordList: [], // 记录列表
-      loading: false,
-      total: 0,
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        deviceId: null,
-      }
-    }
-  },
-  watch: {
-    deviceId(nv, ov) {
-      this.getRecordList(nv);
-    }
-  },
-  created() {
-    this.getRecordList(this.deviceId);
-  },
-  methods: {
-    // 获取记录列表
-    getRecordList(deviceId) {
-      if(deviceId == null) {
-        this.recordList = [];
-        this.total = 0;
-        return;
-      }
-      this.loading = true;
-      this.queryParams.deviceId = deviceId | this.deviceId;
-      listResetRecord(this.queryParams).then(response => {
-        this.recordList = response.rows;
-        this.total = response.total;
-      }).finally(() => {
-        this.loading = false;
-      });
-    }
-  }
-}
-</script>
diff --git a/src/views/mch/device/components/suitList.vue b/src/views/mch/device/components/suitList.vue
deleted file mode 100644
index 7d268e2..0000000
--- a/src/views/mch/device/components/suitList.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-<template>
-  <div>
-    <el-table v-loading="loading" :data="recordList">
-      <el-table-column align="center" type="index" label="#"></el-table-column>
-      <el-table-column align="center" label="时间" prop="createTime"></el-table-column>
-      <el-table-column align="center" label="用户名称" prop="userName"></el-table-column>
-    </el-table>
-
-    <pagination
-      :auto-scroll="false"
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getRecordList"
-    />
-  </div>
-</template>
-
-<script>
-import {listBindRecord} from "@/api/system/bindRecord";
-
-export default {
-  name: 'suitList',
-  props: {
-    // 设备id
-    deviceId: {
-      type: String,
-      default: null
-    }
-  },
-  data() {
-    return {
-      recordList: [], // 记录列表
-      loading: false,
-      total: 0,
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        deviceId: null,
-      }
-    }
-  },
-  watch: {
-    deviceId(nv, ov) {
-      this.getRecordList(nv);
-    }
-  },
-  created() {
-    this.getRecordList(this.deviceId);
-  },
-  methods: {
-    // 获取记录列表
-    getRecordList(deviceId) {
-      if(deviceId == null) {
-        this.recordList = [];
-        this.total = 0;
-        return;
-      }
-      this.loading = true;
-      this.queryParams.deviceId = deviceId | this.deviceId;
-      listBindRecord(this.queryParams).then(response => {
-        this.recordList = response.rows;
-        this.total = response.total;
-      }).finally(() => {
-        this.loading = false;
-      });
-    }
-  }
-}
-</script>
diff --git a/src/views/mch/device/components/tenantList.vue b/src/views/mch/device/components/tenantList.vue
deleted file mode 100644
index ebad01e..0000000
--- a/src/views/mch/device/components/tenantList.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<template>
-  <div>
-    <el-table v-loading="loading" :data="tenantList">
-      <el-table-column align="center" type="index" label="#"></el-table-column>
-      <el-table-column align="center" label="头像" prop="avatar">
-        <template slot-scope="d">
-          <image-preview :src="d.row.avatar" :width="50" :height="50"/>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="用户名称" prop="userName"></el-table-column>
-    </el-table>
-
-    <pagination
-      :auto-scroll="false"
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getUserList"
-    />
-  </div>
-</template>
-
-<script>
-import {listSmUser} from "@/api/system/smUser";
-
-export default {
-  name: 'tenantList',
-  props: {
-    // 设备id
-    deviceId: {
-      type: String,
-      default: null
-    }
-  },
-  data() {
-    return {
-      tenantList: [], // 记录列表
-      loading: false,
-      total: 0,
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        tenantDeviceId: null,
-      }
-    }
-  },
-  watch: {
-    deviceId(nv, ov) {
-      this.getUserList(nv);
-    }
-  },
-  created() {
-    this.getUserList(this.deviceId);
-  },
-  methods: {
-    // 获取记录列表
-    getUserList(deviceId) {
-      if(deviceId == null) {
-        this.recordList = [];
-        this.total = 0;
-        return;
-      }
-      this.loading = true;
-      this.queryParams.tenantDeviceId = deviceId | this.deviceId;
-      listSmUser(this.queryParams).then(response => {
-        this.tenantList = response.rows;
-        this.total = response.total;
-      }).finally(() => {
-        this.loading = false;
-      });
-    }
-  }
-}
-</script>
diff --git a/src/views/mch/device/detail.vue b/src/views/mch/device/detail.vue
index 199d4da..b9e28e1 100644
--- a/src/views/mch/device/detail.vue
+++ b/src/views/mch/device/detail.vue
@@ -16,13 +16,13 @@
                   <el-link :underline="false" icon="el-icon-refresh" @click="handleReset">时长归零</el-link>
                 </el-dropdown-item>
                 <el-dropdown-item>
-                  <el-link :underline="false" icon="el-icon-switch-button" v-if="!isOpen" @click="handleSwitch(true)">强制开启</el-link>
+                  <el-link :underline="false" icon="el-icon-switch-button" v-if="!isOpen" @click="handleSwitch(1)">强制开启</el-link>
                 </el-dropdown-item>
                 <el-dropdown-item>
-                  <el-link :underline="false" icon="el-icon-switch-button" v-if="isOpen" @click="handleSwitch(false)">强制关闭</el-link>
+                  <el-link :underline="false" icon="el-icon-switch-button" v-if="isOpen" @click="handleSwitch(0)">强制关闭</el-link>
                 </el-dropdown-item>
-                <el-dropdown-item>
-                  <el-link :underline="false" icon="el-icon-link" type="danger" @click="handleUnbind" :disabled="deviceData.userId == null">强制解绑</el-link>
+                <el-dropdown-item v-if="deviceData.userId === userId">
+                  <el-link :underline="false" icon="el-icon-link" type="danger" @click="handleUnbind">解除绑定</el-link>
                 </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -55,10 +55,10 @@
           </el-descriptions-item>
           <el-descriptions-item label="WIFI">{{deviceData.wifi | defaultValue}}</el-descriptions-item>
           <el-descriptions-item label="剩余时长">{{surplusTimeDesc(surplusTime).text}}</el-descriptions-item>
-          <el-descriptions-item label="设备剩余时长">
-            {{surplusTimeDesc(deviceData.remainTime).text}}
-            <span class="remark-text">最近更新时间：{{deviceData.lastPullTime}}</span>
-          </el-descriptions-item>
+<!--          <el-descriptions-item label="设备剩余时长">-->
+<!--            {{surplusTimeDesc(deviceData.remainTime).text}}-->
+<!--            <span class="remark-text">最近更新时间：{{deviceData.lastPullTime}}</span>-->
+<!--          </el-descriptions-item>-->
         </el-descriptions>
       </el-card>
 
@@ -111,25 +111,25 @@
       <!--      </el-row>-->
       <!--    </el-card>-->
 
-      <el-card class="box-card">
-        <el-tabs>
-          <el-tab-pane label="套餐列表" :lazy="true">
-            <suit v-if="deviceData.deviceId != null" :device-id="deviceData.deviceId"/>
-          </el-tab-pane>
-          <el-tab-pane label="用户充值记录" :lazy="true">
-            <recharge-record :device-id="deviceData.deviceId"/>
-          </el-tab-pane>
-          <el-tab-pane label="时长变化记录" :lazy="true">
-            <record-time :query="{deviceId: deviceData.deviceId}" view="device"/>
-          </el-tab-pane>
-          <el-tab-pane label="抄表记录" :lazy="true">
-            <reading-record :device-id="deviceData.deviceId"/>
-          </el-tab-pane>
-          <el-tab-pane label="绑定记录" :lazy="true">
-            <bind-record :device-id="deviceData.deviceId"/>
-          </el-tab-pane>
-        </el-tabs>
-      </el-card>
+<!--      <el-card class="box-card">-->
+<!--        <el-tabs>-->
+<!--          <el-tab-pane label="套餐列表" :lazy="true">-->
+<!--            <suit v-if="deviceData.deviceId != null" :device-id="deviceData.deviceId"/>-->
+<!--          </el-tab-pane>-->
+<!--          <el-tab-pane label="订单列表" :lazy="true">-->
+<!--            <recharge-record :device-id="deviceData.deviceId"/>-->
+<!--          </el-tab-pane>-->
+<!--          <el-tab-pane label="时长变化记录" :lazy="true">-->
+<!--            <record-time :query="{deviceId: deviceData.deviceId}" view="device"/>-->
+<!--          </el-tab-pane>-->
+<!--          <el-tab-pane label="抄表记录" :lazy="true">-->
+<!--            <reading-record :device-id="deviceData.deviceId"/>-->
+<!--          </el-tab-pane>-->
+<!--          <el-tab-pane label="绑定记录" :lazy="true">-->
+<!--            <bind-record :device-id="deviceData.deviceId"/>-->
+<!--          </el-tab-pane>-->
+<!--        </el-tabs>-->
+<!--      </el-card>-->
     </div>
     <el-empty v-else description="设备已被删除或不存在"/>
 
@@ -151,25 +151,23 @@
 
 <script>
 
-import { addTime, getDevice, refreshIot, resetDevice, switchDevice, unbind } from '@/api/system/device'
 import LineChart from "@/views/dashboard/LineChart.vue";
-import RechargeRecord from "@/views/system/device/components/rechargeRecord.vue";
-import { findLabel, formatDate } from '@/utils'
 import QrCode from "@/components/QrCode/index.vue";
-import MeterRecordReport from "@/views/system/device/components/meterRecordReport.vue";
-import ReadingRecord from "@/views/system/device/components/readingRecord.vue";
 import {getWxIndexUrl} from "@/utils/wx";
-import BindRecord from "@/views/system/device/components/bindRecord.vue";
-import ResetRecord from "@/views/system/device/components/resetRecord.vue";
-import TenantList from "@/views/system/device/components/tenantList.vue";
-import SuitList from '@/views/system/device/components/suitList.vue'
 import Suit from '@/views/ss/suit/index.vue'
-import RecordTime from '@/views/ss/time/index.vue'
 import { toDescriptionFromSecond } from '@/utils/date'
 import StoreLink from '@/components/Business/Store/StoreLink.vue'
 import UserLink from '@/components/Business/SmUser/UserLink.vue'
 import { $serviceType } from '@/utils/mixins'
-import { mchGetDevice, mchRefreshIot } from '@/api/mch/device'
+import {
+  mchAddTime,
+  mchGetDevice,
+  mchRefreshIot,
+  mchResetDevice,
+  mchSwitchDevice,
+  mchUnbindDevice
+} from '@/api/mch/device'
+import { mapGetters } from 'vuex'
 
 export default {
   name: 'MyDeviceDetail',
@@ -177,10 +175,10 @@ export default {
   components: {
     UserLink,
     StoreLink,
-    RecordTime,
     Suit,
-    SuitList,
-    TenantList, ResetRecord, BindRecord, ReadingRecord, MeterRecordReport, QrCode, RechargeRecord, LineChart},
+    QrCode,
+    LineChart
+  },
   dicts: ['sm_device_status', 'sm_device_outage_way', 'sm_device_notice_way', 'sm_model_tag', 'sm_device_online_status', 'service_type'],
   data() {
     return {
@@ -202,6 +200,7 @@ export default {
     }
   },
   computed: {
+    ...mapGetters(['userId']),
     qrCodeText() {
       return (device) => {
         return getWxIndexUrl({ s: device.deviceNo});
@@ -231,7 +230,7 @@ export default {
         type: 'warning'
       }).then(() => {
         this.loading = true;
-        unbind(this.deviceData.deviceId).then(res => {
+        mchUnbindDevice(this.deviceData.deviceId).then(res => {
           if (res.code === 200) {
             this.$message.success("操作成功");
           }
@@ -240,17 +239,17 @@ export default {
         })
       })
     },
-    handleSwitch(open) {
-      this.$confirm(`是否确认强制${open ? '开启' : '关闭'}设备？`, '警告', {
+    handleSwitch(status) {
+      this.$confirm(`是否确认强制${status === 1 ? '开启' : '关闭'}设备？`, '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         this.loading = true;
-        switchDevice(this.deviceData.deviceId, open).then(res => {
+        mchSwitchDevice(this.deviceData.deviceId, status).then(res => {
           if (res.code === 200) {
             this.$message.success("操作成功");
-            this.deviceData.powerStatus = open ? '1' : '0';
+            this.deviceData.powerStatus = status === 1 ? '1' : '0';
           }
         }).finally(() => {
           this.loading = false;
@@ -275,7 +274,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        resetDevice(this.deviceData.deviceId).then(res => {
+        mchResetDevice(this.deviceData.deviceId).then(res => {
           if (res.code === 200) {
             this.$message.success('操作成功');
             this.getDevice();
@@ -288,7 +287,7 @@ export default {
       this.showAddElectricity = true;
     },
     submitAddElectricity() {
-      addTime(this.deviceData.deviceId, this.addElectricityForm.amount).then(res => {
+      mchAddTime(this.deviceData.deviceId, this.addElectricityForm.amount).then(res => {
         if (res.code === 200) {
           this.$message.success('操作成功');
           this.showAddElectricity = false;
diff --git a/src/views/mch/device/index.vue b/src/views/mch/device/index.vue
index 9c6f2e9..e6ffab2 100644
--- a/src/views/mch/device/index.vue
+++ b/src/views/mch/device/index.vue
@@ -169,13 +169,16 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="6em">
         <el-row :gutter="gutter">
           <form-col :span="span"  label="图片" prop="customPicture">
-              <image-upload v-model="form.customPicture" :limit="1"/>
+            <image-upload v-model="form.customPicture" :limit="1"/>
           </form-col>
           <form-col :span="span"  label="设备名称" prop="deviceName">
-              <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
+            <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
+          </form-col>
+          <form-col :span="span"  label="所属店铺" prop="storeId">
+            <store-input v-model="form.storeId" />
           </form-col>
           <form-col :span="span * 2" label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
+            <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
           </form-col>
           <!--计时配置-->
           <form-col :span="span" label="起步时长" prop="startTime">
@@ -188,9 +191,9 @@
             </el-input>
           </form-col>
           <form-col :span="span" label="起步价" prop="startPrice">
-              <el-input v-model="form.startPrice" type="number" placeholder="请输入起步价" >
-                <template #append>元</template>
-              </el-input>
+            <el-input v-model="form.startPrice" type="number" placeholder="请输入起步价" >
+              <template #append>元</template>
+            </el-input>
           </form-col>
           <form-col :span="span" label="续期时长" prop="overTime">
             <el-input v-model="form.overTime" type="number" placeholder="请输入续期时长" >
@@ -202,9 +205,9 @@
             </el-input>
           </form-col>
           <form-col :span="span" label="续期价" prop="overPrice">
-              <el-input v-model="form.overPrice" type="number" placeholder="请输入续期价" >
-                <template #append>元</template>
-              </el-input>
+            <el-input v-model="form.overPrice" type="number" placeholder="请输入续期价" >
+              <template #append>元</template>
+            </el-input>
           </form-col>
         </el-row>
       </el-form>