diff --git a/src/pages.json b/src/pages.json
index 63f011b..8892d92 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -175,7 +175,7 @@
 				{
 					"path": "pages/switch_manage/switch_manage",
 					"style" : {
-						"navigationBarTitleText": "开关管理"
+						"navigationBarTitleText": "管理"
 					}
 				},
 				{
@@ -223,7 +223,7 @@
 				{
 					"path": "pages/sell_box_manage/sell_box_manage",
 					"style" : {
-						"navigationBarTitleText": "平板管理"
+						"navigationBarTitleText": "售货柜管理"
 					}
 				}
 			]
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index f2345af..5251d5f 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -120,6 +120,12 @@
 			path: '',
 			serverKey: 1009  // 后端对应权限编号
 		},
+		{
+			id: 9,
+			name: '设备管理',
+			path: '',
+			serverKey: 1010  // 后端对应权限编号
+		},
 	];
 	
 	const app = getApp();
diff --git a/src/static/images/icon/index/tab_9.png b/src/static/images/icon/index/tab_9.png
new file mode 100644
index 0000000..b0a28cc
Binary files /dev/null and b/src/static/images/icon/index/tab_9.png differ
diff --git a/src/subpackage/device/pages/device_manage/device_manage.vue b/src/subpackage/device/pages/device_manage/device_manage.vue
index fed5e0e..94e4849 100644
--- a/src/subpackage/device/pages/device_manage/device_manage.vue
+++ b/src/subpackage/device/pages/device_manage/device_manage.vue
@@ -1,31 +1,36 @@
 <template>
     <view class="device-manage">
         <store-name></store-name>
-        <view class="dm-tit">售货柜管理</view>
+        <view class="dm-tit">{{pageInfo.name || '-'}}</view>
         <view class="dm-list">
             <view class="dl-item" v-for="i in 10" :key="i">
                 <view class="di-header">
                     <image></image>
                     <view class="dh-name">欧轩智能测试柜-01</view>
-                    <view class="dh-test-btn">
-                        <image></image>
-                        <view>测试</view>
+                    <view class="dh-test-btn"  v-if="pageInfo.isTestBtn" @click="testBtn">
+                        <image mode="aspectFit" :src="pageInfo.testBtnIcon || ''"></image>
+                        <view>{{pageInfo.testBtnName || '-'}}</view>
                     </view>
                 </view>
                 <view class="di-section">
-                    <view class="ds-stock">
+                    <view class="ds-stock" v-if="pageInfo.isShowStock">
                         <view>库存：<text class="active">充足</text></view>
-                        <view>补货</view>
+                        <view hover-class="hover-active" @click="stockBtn">{{pageInfo.stockBtnName || '-'}}</view>
                     </view>
                     <view class="ds-contral">
                         <view>
                             设备：<text class="active">离线</text>
                         </view>
-                        <view>更新</view>
-                        <view class="active">
-                            <text>开启售货</text>
-                            <image></image>
+                        <view hover-class="hover-active">更新</view>
+                        <view v-if="isStart"  hover-class="hover-active" @click="isStart = !isStart">
+                            <text>{{pageInfo.deviceBtnOpenName || '-'}}</text>
+                            <image mode="aspectFit" src="/subpackage/device/static/images/start.png"></image>
                         </view>
+                        <view class="active" v-else hover-class="hover-active" @click="isStart = !isStart">
+                            <text>{{pageInfo.deviceBtnStopName || '-'}}</text>
+                            <image mode="aspectFit" src="/subpackage/device/static/images/stop.png"></image>
+                        </view>
+                        
                     </view>
                 </view>
             </view>
@@ -34,26 +39,86 @@
 </template>
 
 <script>
+import util from '../../../../utils/util';
 import store_name from '../../components/store_name/store_name';
 const dmObj = {
     'd7': {
         id: 7,
-        name: '',
+        name: '售货柜管理',
         isTestBtn: true,
-        testBtnIcon: '',
+        testBtnIcon: '/subpackage/device/static/images/test_btn.png',
         testBtnName: '测试',
         isShowStock: true,
         stockBtnName: '补货',
         deviceBtnOpenName: '开启售货',
         deviceBtnStopName: '停止售货',
-    }
+    },
+    'd8': {
+        id: 8,
+        name: '租售柜管理',
+        isTestBtn: false,
+        testBtnIcon: '/subpackage/device/static/images/test_btn.png',
+        testBtnName: '测试',
+        isShowStock: true,
+        stockBtnName: '查看',
+        deviceBtnOpenName: '开启售货',
+        deviceBtnStopName: '停止售货',
+    },
+    'd9': {
+        id: 9,
+        name: '储物柜管理',
+        isTestBtn: true,
+        testBtnIcon: '/subpackage/device/static/images/test_btn.png',
+        testBtnName: '打开',
+        isShowStock: false,
+        stockBtnName: '查看',
+        deviceBtnOpenName: '开启租用',
+        deviceBtnStopName: '停止租用',
+    },
+    'd10': {
+        id: 10,
+        name: '咖啡机管理',
+        isTestBtn: true,
+        testBtnIcon: '/subpackage/device/static/images/test_btn.png',
+        testBtnName: '测试',
+        isShowStock: true,
+        stockBtnName: '补货',
+        deviceBtnOpenName: '开启售货',
+        deviceBtnStopName: '停止售货',
+    },
 }
 export default {
     components: {
         'store-name': store_name
     },
+    data(){
+        return {
+            pageInfo: {},
+            isStart: false
+        }
+    },
     onLoad(options){
-        console.log(options)
+
+        let _pageInfo = dmObj[`d${options.sid}`] || {};
+        this.pageInfo = _pageInfo;
+        uni.setNavigationBarTitle({ title: _pageInfo.name });
+    },
+    methods: {
+        stockBtn(){
+            console.log(123)
+            let { pageInfo } = this;
+            if(pageInfo.id == 7)return util.routeTo(`/subpackage/device/pages/sell_box_manage/sell_box_manage`, 'nT');
+            if(pageInfo.id == 8)return util.routeTo(`/subpackage/device/pages/locker_manage/locker_manage?type=8`, 'nT');
+            // if(pageInfo.id == 9)return util.routeTo(`/subpackage/device/pages/locker_manage/locker_manage`, 'nT');
+            if(pageInfo.id == 10)return util.routeTo(`/subpackage/device/pages/coffee_manage/coffee_manage`, 'nT');
+        },
+        testBtn(){
+            let { pageInfo } = this;
+            if(pageInfo.id == 7)return util.routeTo(`/subpackage/device/pages/sell_box_test/sell_box_test`, 'nT');
+            // if(pageInfo.id == 8)return util.routeTo(`/subpackage/device/pages/locker_manage/locker_manage`, 'nT');
+            if(pageInfo.id == 9)return util.routeTo(`/subpackage/device/pages/locker_manage/locker_manage?type=9`, 'nT');
+            if(pageInfo.id == 10)return util.routeTo(`/subpackage/device/pages/coffee_test/coffee_test`, 'nT');
+        }
     }
 }
 </script>
@@ -102,7 +167,6 @@ export default {
                     margin: 0 auto 8upx;
                     width: 36upx;
                     height: 36upx;
-                    background-color: grey;
                 }
                 >view{
                     text-align: center;
@@ -182,7 +246,6 @@ export default {
                             vertical-align: middle;
                             width: 32upx;
                             height: 32upx;
-                            background-color: red;
                         }
                         &.active{
                             border-color: #EA5061;
diff --git a/src/subpackage/device/pages/index/index.vue b/src/subpackage/device/pages/index/index.vue
index 2728bc4..09bb146 100644
--- a/src/subpackage/device/pages/index/index.vue
+++ b/src/subpackage/device/pages/index/index.vue
@@ -49,7 +49,7 @@ export default {
         },
         routeTo(e){
             if(e.path == '')return util.showNone('暂未开放！');
-            util.routeTo(`${rootPage}${e.path}?id=${e.id}`, 'nT');
+            util.routeTo(`${rootPage}${e.path}?sid=${e.id}`, 'nT');
         }
     }
 }
diff --git a/src/subpackage/device/pages/locker_manage/locker_manage.vue b/src/subpackage/device/pages/locker_manage/locker_manage.vue
index c7f7bf9..81496ef 100644
--- a/src/subpackage/device/pages/locker_manage/locker_manage.vue
+++ b/src/subpackage/device/pages/locker_manage/locker_manage.vue
@@ -5,7 +5,7 @@
             <view class="ll-item" v-for="i in 10" :key="i">
                 <view class="li-left">
                     <view class="ll-box">2号</view>
-                    <view class="ll-tag">已租</view>
+                    <view class="ll-tag" :class="[i==1?'grey':i==2?'orange':'']">已租</view>
                 </view>
                 <view class="li-content">
                     <view>
@@ -19,7 +19,7 @@
                 </view>
             </view>
         </view>
-        <view class="lm-tip">Tips：如需更换货物、设置价格请前往PC端商家后台设置</view>
+        <view class="lm-tip">{{getTip}}</view>
         <view class="lm-fixed-bar">
             
         </view>
@@ -28,16 +28,47 @@
                 <image class="active" mode="aspectFit" src="/subpackage/device/static/images/selected_987.png"></image>
                 <text>全选</text>
             </view>
-            <view class="lfb-confirm" hover-class="hover-active">打开柜子</view>
+            <view class="lfb-confirm" hover-class="hover-active" @click="openLocker">打开柜子</view>
         </view>
     </view>
 </template>
 
 <script>
+import util from '../../../../utils/util';
 import device_name from '../../components/device_name/device_name';
 export default {
     components: {
         'device-name': device_name
+    },
+    computed: {
+        getTip(){
+            let { type } = this;
+            if(type == 8)return 'Tips：如需更换货物、设置价格请前往PC端商家后台设置';
+            if(type == 9)return 'Tips：如需设置柜子信息、设置价格请前往PC端商家后台设置';
+            return 
+        }
+    },
+    data(){
+        return{
+            
+        }
+    },
+    onLoad(options){
+        this.type = options.type;
+        console.log(options)
+    },
+    methods: {
+        openLocker(){
+            let { type } = this;
+            if(type == 8)return util.showModal({
+                title: '提示',
+                content: '是否补货',
+                showCancel: true,
+                success: modalRes=>{
+                    console.log(modalRes)
+                }
+            })
+        }
     }
 }
 </script>
@@ -57,6 +88,20 @@ export default {
             border-radius: 10upx;
             background-color: #fff;
             @include centerFlex(space-between);
+            &:nth-child(odd){
+                .li-left{
+                    border: none;
+                    background-color: #f0f0f1;
+                    .ll-box{
+                        border: none;
+                        background-color: #e3e3e5;
+                        &::before{
+                            border: none;
+                            background-color: #f0f0f1;
+                        }
+                    }
+                }
+            }
             .li-left{
                 flex-shrink: 0;
                 position: relative;
@@ -64,7 +109,7 @@ export default {
                 width: 156upx;
                 height: 156upx;
                 border-radius: 10upx;
-                background-color: #f0f0f1;
+                border: 2upx solid #ededf5;
                 @include centerFlex(center);
                 .ll-box{
                     position: relative;
@@ -79,7 +124,7 @@ export default {
                     overflow: hidden;
                     text-overflow: ellipsis;
                     white-space: nowrap;
-                    background-color: #e3e3e5;
+                    border: 2upx solid #ededf5;
                     &::before{
                         content: '';
                         position: absolute;
@@ -89,7 +134,7 @@ export default {
                         width: 10upx;
                         height: 20upx;
                         border-radius: 6upx;
-                        background-color: #f0f0f1;
+                        border: 2upx solid #ededf5;
                     }
                 }
                 .ll-tag{
@@ -103,6 +148,14 @@ export default {
                     line-height: 28upx;
                     font-size: 20upx;
                     color: $themeColor;
+                    &.grey{
+                        border-color: #D8D8D8;
+                        color: #9A9A9D;
+                    }
+                    &.orange{
+                        border-color: #FF873D;
+                        color: #FF873D;
+                    }
                 }
             }
             .li-content{
diff --git a/src/subpackage/device/pages/switch_manage/switch_manage.vue b/src/subpackage/device/pages/switch_manage/switch_manage.vue
index d0220f8..31b4f5a 100644
--- a/src/subpackage/device/pages/switch_manage/switch_manage.vue
+++ b/src/subpackage/device/pages/switch_manage/switch_manage.vue
@@ -97,7 +97,7 @@ export default {
         }
     },
     onLoad(options){
-        let _pageInfo = showArr[`s${options.id}`] || {};
+        let _pageInfo = showArr[`s${options.sid}`] || {};
         this.pageInfo = _pageInfo;
         uni.setNavigationBarTitle({ title: _pageInfo.name });
     },
diff --git a/src/subpackage/device/static/images/start.png b/src/subpackage/device/static/images/start.png
new file mode 100644
index 0000000..49df949
Binary files /dev/null and b/src/subpackage/device/static/images/start.png differ
diff --git a/src/subpackage/device/static/images/stop.png b/src/subpackage/device/static/images/stop.png
new file mode 100644
index 0000000..2c2e7c0
Binary files /dev/null and b/src/subpackage/device/static/images/stop.png differ
diff --git a/src/subpackage/device/static/images/test_btn.png b/src/subpackage/device/static/images/test_btn.png
new file mode 100644
index 0000000..f596cad
Binary files /dev/null and b/src/subpackage/device/static/images/test_btn.png differ