diff --git a/page_user/luru/bind_mac.vue b/page_user/luru/bind_mac.vue
index 2bb17ca..c5b8862 100644
--- a/page_user/luru/bind_mac.vue
+++ b/page_user/luru/bind_mac.vue
@@ -1,14 +1,5 @@
 <template>
   <view class="page">
-    <u-navbar
-      :background="bgc"
-      :border-bottom="false"
-      :custom-back="btnfh"
-      height="50"
-      title="添加设备"
-      title-color="#262B37"
-      title-size="38"
-    ></u-navbar>
     <view class="iptbox" @click="backpage()">
       <input
         v-model="mac"
@@ -38,19 +29,19 @@
         type="text"
       />
     </view>
-    <view class="iptbox" @click="kashow = true">
-      <view v-if="kaname" class=""> 卡商：{{ kaname }}</view>
-      <view v-else class=""> 请点击选择卡商</view>
-    </view>
-    <u-select v-model="kashow" :list="kalist" title="选择卡商" @confirm="confirmka"></u-select>
-    <view class="iptbox" @click="show = true">
-      <view v-if="hardwareInfo.version" class=""> 版本：{{ hardwareInfo.version }}</view>
-      <view v-else class=""> 请点击选择版本</view>
-    </view>
-    <view v-if="hardwareInfo.version" class="tips">
-      版本介绍：{{ hardwareInfo.instructions }}
-    </view>
-    <u-select v-model="show" :list="list" title="选择版本" @confirm="confirm"></u-select>
+    <!--    <view class="iptbox" @click="kashow = true">-->
+    <!--      <view v-if="kaname" class=""> 卡商：{{ kaname }}</view>-->
+    <!--      <view v-else class=""> 请点击选择卡商</view>-->
+    <!--    </view>-->
+    <!--    <u-select v-model="kashow" :list="kalist" title="选择卡商" @confirm="confirmka"></u-select>-->
+    <!--    <view class="iptbox" @click="show = true">-->
+    <!--      <view v-if="hardwareInfo.version" class=""> 版本：{{ hardwareInfo.version }}</view>-->
+    <!--      <view v-else class=""> 请点击选择版本</view>-->
+    <!--    </view>-->
+    <!--    <view v-if="hardwareInfo.version" class="tips">-->
+    <!--      版本介绍：{{ hardwareInfo.instructions }}-->
+    <!--    </view>-->
+    <!--    <u-select v-model="show" :list="list" title="选择版本" @confirm="confirm"></u-select>-->
 
     <view class="imgs" style="margin-top: 30rpx">
       <image
@@ -60,17 +51,17 @@
       ></image>
     </view>
     <view class="btn" @click="bind()"> 确认添加</view>
-    <view class="bot_btn">
-      <view class="btn1" @click="btnfh"> 返回</view>
-      <view class="btn1" @click="findDevice()"> 蓝牙链接</view>
-      <view v-if="carstause" class="btn1" @click="ring()"> 响铃寻车</view>
+    <!--    <view class="bot_btn">-->
+    <!--      <view class="btn1" @click="btnfh"> 返回</view>-->
+    <!--      <view class="btn1" @click="findDevice()"> 蓝牙链接</view>-->
+    <!--      <view v-if="carstause" class="btn1" @click="ring()"> 响铃寻车</view>-->
 
-      <view v-if="carstause" class="btn1" @click="open()"> 蓝牙开锁</view>
-      <view v-if="carstause" class="btn1" @click="close()"> 蓝牙关锁</view>
-      <view v-if="carstause" class="btn1" @click="shaoru"> 进入烧录</view>
-      <view v-if="carstause" class="btn1" @click="reboot()"> 设备重启</view>
-      <view v-if="isbands" class="btn1" @click="Binddevice()"> 接口响铃</view>
-    </view>
+    <!--      <view v-if="carstause" class="btn1" @click="open()"> 蓝牙开锁</view>-->
+    <!--      <view v-if="carstause" class="btn1" @click="close()"> 蓝牙关锁</view>-->
+    <!--      <view v-if="carstause" class="btn1" @click="shaoru"> 进入烧录</view>-->
+    <!--      <view v-if="carstause" class="btn1" @click="reboot()"> 设备重启</view>-->
+    <!--      <view v-if="isbands" class="btn1" @click="Binddevice()"> 接口响铃</view>-->
+    <!--    </view>-->
     <u-mask :show="showbind" :z-index="100" />
     <view v-if="showbind" class="tip_box">
       <view v-if="showbind" class="top">
diff --git a/page_user/luru/controlDevice.vue b/page_user/luru/controlDevice.vue
index a0a3842..0a6ab60 100644
--- a/page_user/luru/controlDevice.vue
+++ b/page_user/luru/controlDevice.vue
@@ -1,105 +1,68 @@
 <template>
-  <view class="pages">
-    <u-navbar
-      :background="bgc"
-      :border-bottom="false"
-      :custom-back="backPage"
-      height="50"
-      title="设备控制"
-      title-color="#262B37"
-      title-size="38"
-    ></u-navbar>
-    <view class="title">
-      <text>控制台</text>
-    </view>
+  <view class="">
+    <view class="title"> 控制台</view>
+    <view class="shuom"> 请扫描设备上的二维码</view>
     <view class="iptbox">
       <view class="qrcode" @click="qrcode()">
         <image
-          mode=""
+          mode="aspectFit"
           src="https://api.ccttiot.com/smartmeter/img/static/uy7BNwAMIKwvstqFnRhs"
-        ></image>
+        >
+        </image>
       </view>
       <input
-        v-model="sn"
+        v-model="storeId"
         class="ips"
         placeholder="请扫描设备上的二维码"
         placeholder-class="my-placeholder"
         style="margin-left: 32rpx"
         type="text"
-        @input="search()"
       />
     </view>
-    <view class="txt"> MAC：{{ carInfo.mac == undefined ? '--' : carInfo.mac }} </view>
-    <view class="txt">
+    <view class="machao"> MAC号：{{ obj.mac == undefined ? '--' : obj.mac }}</view>
+    <view class="machao"> 电压：{{ obj.voltage == undefined ? '--' : obj.voltage }}V</view>
+    <view class="machao">
+      功率：{{ obj.realTimePower == undefined ? '--' : obj.realTimePower }}W
+    </view>
+    <view class="machao"> 电流：{{ obj.electricity == undefined ? '--' : obj.electricity }}A</view>
+    <view class="machao">
       网络：
-      <span v-if="carInfo.onlineStatus == 0">离线</span>
-      <span v-if="carInfo.onlineStatus == 1" style="color: #8883f0">在线</span>
+      <text v-if="onlineStatus == '离线'" style="color: red">离线</text>
+      <text v-if="onlineStatus == '在线'" style="color: green">在线</text>
     </view>
-    <view class="txt">
-      信号：{{ carInfo.signalStrength == undefined ? '--' : carInfo.signalStrength }}
+    <view class="machao">
+      状态：
+      <text v-if="powerStatus == '关闭'" style="color: red">关闭</text>
+      <text v-if="powerStatus == '开启'" style="color: green">开启</text>
     </view>
-    <view class="txt">
-      卫星：{{ carInfo.satellites == undefined ? '--' : carInfo.satellites }}
+    <view class="machao"> 版本号：{{ obj.version == undefined ? '--' : obj.version }}</view>
+    <view class="machao">
+      最后更新时间：{{ obj.lastPullTime == undefined ? '--' : obj.lastPullTime }}
     </view>
-    <view class="txt">
-      电压：{{ carInfo.voltage == undefined ? '--' : carInfo.voltage.toFixed(2) }}V
+    <view class="machao">
+      最后在线时间：{{ obj.lastOnlineTime == undefined ? '--' : obj.lastOnlineTime }}
     </view>
-    <view class="txt">
-      锁状态：
-      <span v-if="carInfo.lockStatus == 0">关</span>
-      <span v-if="carInfo.lockStatus == 1" style="color: #8883f0">开</span>
-    </view>
-    <view class="txt">
-      电门：
-      <span v-if="carInfo.quality == 0">关</span>
-      <span v-if="carInfo.quality == 1" style="color: #8883f0">开</span>
-    </view>
-    <view class="txt">
-      硬件版本：{{ carInfo.hardwareVersion == undefined ? '--' : carInfo.hardwareVersion }}
-    </view>
-    <view class="txt" style="display: flex; justify-content: space-between; align-items: center">
-      <view class="">
-        软件版本：{{ carInfo.softwareVersion == undefined ? '--' : carInfo.softwareVersion }}
+
+    <view class="jiaozhun">
+      <view class="input">
+        <button @click="btnjian">-</button>
+        <input v-model="valuedian" placeholder="输入校准电压" type="text" />
+        <button @click="btnadd">+</button>
       </view>
-      <view
-        class=""
-        style="
-          font-size: 30rpx;
-          background-color: #8883f0;
-          color: #fff;
-          padding: 6rpx 10rpx;
-          border-radius: 10rpx;
-        "
-        @click="btnsj"
-      >
-        升级
+      <view class="view" @click="btnjiaozhun"> 校准电压</view>
+    </view>
+
+    <view class="list">
+      <view class="anniulist">
+        <view class="anniu" @click="btncq"> 重启</view>
+        <view class="anniu" @click="btnsxs"> 刷新</view>
       </view>
-    </view>
-    <view class="txt">
-      声音：
-      <span v-if="carInfo.music == 0">静音</span>
-      <span v-if="carInfo.music == 1">语音</span>
-      <span v-if="carInfo.music == 2">彩铃</span>
-    </view>
-    <view class="txt">
-      最后定位时间：{{ carInfo.lastLocationTime == undefined ? '--' : carInfo.lastLocationTime }}
-    </view>
-    <view class="txt">
-      最后在线时间：{{ carInfo.lastOnlineTime == undefined ? '--' : carInfo.lastOnlineTime }}
-    </view>
-    <view class="btnbox">
-      <view class="btn_box" style="margin-bottom: 20rpx"> </view>
-      <view class="btn_box">
-        <view class="btn1" @click="btn(0)"> 开锁 </view>
-        <view class="btn1" @click="btn(1)"> 关锁 </view>
-        <view class="btn1" @click="btn(9)"> 坐垫锁 </view>
+      <view class="anniulist">
+        <view class="anniu" @click="btnkq"> 开启</view>
+        <view class="anniu" @click="btngb"> 关闭</view>
+        <view class="anniu" @click="btnsx"> 同步</view>
       </view>
-      <view class="btn_box" style="margin-top: 20rpx">
-        <view class="btn1" @click="btn(3)"> 响铃 </view>
-        <view class="btn1" @click="btn(8)"> 重启 </view>
-        <view class="btn1" @click="btn(4)"> 更新 </view>
-      </view>
-      <view class="btn2" style="margin-top: 20rpx" @click="back()"> 返回扫描 </view>
+      <view class="fanhui" @click="btnfh"> 返回</view>
     </view>
   </view>
 </template>
@@ -108,88 +71,142 @@
 export default {
   data() {
     return {
-      titleflag: false, //提示隐藏
       bgc: {
         backgroundColor: '#F7FAFE',
       },
-      sn: '',
-      carInfo: {},
+      storeId: '',
+      obj: {},
+      id: '',
+      onlineStatus: '--',
+      powerStatus: '--',
+      valuedian: 220,
+      xshu: '1',
+      x: '',
     }
   },
-  onLoad(e) {
-    if (e.sn) {
-      this.sn = e.sn
-      this.deviceInfo()
+  onLoad(options) {
+    if (options.sn) {
+      this.storeId = options.sn
+      this.getsn()
     }
   },
-  onShow() {},
-  mounted() {
-    // this.videoContext = uni.createVideoContext('myVideo', this)
+  // 分享到好友（会话）
+  onShareAppMessage: function () {
+    return {
+      title: '创想物联',
+      path: '/pages/shouye/index',
+    }
+  },
+
+  // 分享到朋友圈
+  onShareTimeline: function () {
+    return {
+      title: '创想物联',
+      query: '',
+      path: '/pages/shouye/index',
+    }
   },
   methods: {
-    // 点击升级
-    btnsj() {
-      uni.showLoading({
-        title: '加载中...',
-        mask: true,
-      })
-      this.$u.put(`/bst/device/iot/update?sn=${this.sn}`).then(res => {
-        if (res.code === 200) {
-          uni.hideLoading()
+    btncq() {
+      this.$u.put(`/app/device/admin/reboot?sn=${this.storeId}`).then(res => {
+        if (res.code == 200) {
           uni.showToast({
-            title: '操作成功',
+            title: '重启成功',
             icon: 'success',
-            duration: 3000,
+            duration: 2000,
           })
         } else {
           uni.showToast({
             title: res.msg,
             icon: 'none',
-            duration: 3000,
+            duration: 2000,
           })
         }
       })
     },
-    backPage() {
-      uni.redirectTo({
-        url: '/page_user/luru/index',
+    btnsxs() {
+      this.$u.put(`/app/device/admin/uploadData?sn=${this.storeId}`).then(res => {
+        if (res.code == 200) {
+          this.obj = res.data
+          this.id = res.data.deviceId
+          if (res.data.vxs == null) {
+            this.xshu = 1
+          } else {
+            this.xshu = res.data.vxs
+          }
+          if (res.data.onlineStatus == 0) {
+            this.onlineStatus = '离线'
+          } else if (res.data.onlineStatus == 1) {
+            this.onlineStatus = '在线'
+          }
+          if (res.data.powerStatus == 0) {
+            this.powerStatus = '关闭'
+          } else if (res.data.powerStatus == 1) {
+            this.powerStatus = '开启'
+          }
+          uni.showToast({
+            title: res.msg,
+            icon: 'success',
+            duration: 2000,
+          })
+          uni.hideLoading()
+        } else {
+          uni.showToast({
+            title: res.msg,
+            icon: 'none',
+            duration: 2000,
+          })
+        }
       })
     },
-    back() {
+    btnjian() {
+      this.valuedian = Number(this.valuedian) - 1
+    },
+    btnadd() {
+      this.valuedian = Number(this.valuedian) + 1
+    },
+    btnjiaozhun() {
+      this.x = (this.valuedian / this.obj.voltage) * this.xshu
+      this.x = this.x.toFixed(3)
+      console.log(this.x)
+      this.$u.put(`/app/device/admin/${this.obj.deviceId}/vxs?vxs=${this.x}`).then(res => {
+        if (res.code == 200) {
+          uni.showToast({
+            title: '校准成功',
+            icon: 'success',
+            duration: 2000,
+          })
+          this.getsn()
+        } else {
+          uni.showToast({
+            title: res.msg,
+            icon: 'none',
+          })
+        }
+      })
+    },
+
+    btnmy() {
       uni.reLaunch({
-        url: '/page_user/luru/index',
+        url: '/pages/my',
       })
     },
-    search() {
-      if (this.sn && this.sn.length === 7 && /^\d+$/.test(this.sn)) {
-        // 当 this.sn 满足条件时调用 deviceInfo
-        this.deviceInfo()
-      } else {
-        console.log('SN 不是 7 位数字')
-        // 你可以在这里处理不符合条件的情况，比如提示用户输入正确的 SN
-      }
-    },
     qrcode() {
       uni.scanCode({
         onlyFromCamera: true,
         scanType: ['qrCode'],
         success: res => {
-          let sn = null
-          let queryParams = res.result.split('?')[1]
-          if (queryParams) {
-            let params = queryParams.split('&')
-            params.forEach(param => {
-              let [key, value] = param.split('=')
-              if (key === 's') {
-                sn = value
-              }
-            })
-          }
-          this.sn = sn
-          console.log(res.result)
-          if (this.sn != '') {
-            this.deviceInfo()
+          function getQueryParam(url, paramName) {
+            let regex = new RegExp(`[?&]${paramName}=([^&]*)`)
+            let results = regex.exec(url)
+            return results ? decodeURIComponent(results[1].replace(/\+/g, ' ')) : null
           }
+
+          let sceneValue = res.result
+          let decodedValue = decodeURIComponent(sceneValue)
+          let id = getQueryParam(decodedValue, 's')
+          this.storeId = id
+          this.getsn()
         },
         fail: err => {
           console.error('扫描失败：', err)
@@ -200,240 +217,231 @@ export default {
         },
       })
     },
-    deviceInfo() {
-      this.$u
-        .get('/bst/device?sn=' + this.sn)
-        .then(res => {
-          if (res.code === 200) {
-            this.carInfo = res.data
+
+    getsn() {
+      this.$u.get(`/app/device/admin/get?sn=${this.storeId}`).then(res => {
+        if (res.code == 200) {
+          this.obj = res.data
+          this.id = res.data.deviceId
+          if (res.data.vxs == null) {
+            this.xshu = 1
+          } else {
+            this.xshu = res.data.vxs
           }
-        })
-        .catch(error => {
-          console.error('Error fetching area data:', error)
-        })
+          if (res.data.onlineStatus == 0) {
+            this.onlineStatus = '离线'
+          } else if (res.data.onlineStatus == 1) {
+            this.onlineStatus = '在线'
+          }
+          if (res.data.powerStatus == 0) {
+            this.powerStatus = '关闭'
+          } else if (res.data.powerStatus == 1) {
+            this.powerStatus = '开启'
+          }
+          uni.showToast({
+            title: res.msg,
+            icon: 'success',
+            duration: 2000,
+          })
+          uni.hideLoading()
+        } else {
+          uni.showToast({
+            title: res.msg,
+            icon: 'none',
+            duration: 2000,
+          })
+        }
+      })
     },
-    btn(num) {
-      if (num == 0) {
-        uni.showLoading({
-          title: '加载中...',
-        })
-        console.log('点击了....1')
-        this.$u
-          .put('/bst/device/iot/unlock?sn=' + this.sn)
-          .then(res => {
-            if (res.code == 200) {
-              // 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构
-              this.deviceInfo()
-              uni.showToast({
-                title: '操作成功',
-                icon: 'success',
-                duration: 2000,
-              })
-            } else {
-              uni.hideLoading()
-              uni.showToast({
-                title: res.msg,
-                icon: 'none',
-                duration: 2000,
-              })
-            }
+
+    // 返回录入
+    btnfh() {
+      uni.navigateBack({
+        delta: 1, // 返回的页面数，默认1
+        success: () => {
+          console.log('返回上一页成功')
+        },
+        fail: err => {
+          console.error('返回上一页失败:', err)
+        },
+      })
+    },
+
+    // 开启
+    btnkq() {
+      uni.showLoading({
+        title: '设备开启中...',
+      })
+      this.$u.put(`/app/device/admin/${this.id}/switch?open=true`).then(res => {
+        if (res.code == 200) {
+          uni.showToast({
+            title: '开启成功',
+            icon: 'success',
+            duration: 2000,
           })
-          .catch(error => {
-            console.error('Error fetching area data:', error)
+          this.powerStatus = '开启'
+        } else {
+          uni.showToast({
+            title: '开启失败',
+            icon: 'none',
+            duration: 2000,
           })
-      } else if (num == 1) {
-        uni.showLoading({
-          title: '加载中...',
-        })
-        console.log('点击了....2')
-        this.$u
-          .put('/bst/device/iot/lock?sn=' + this.sn)
-          .then(res => {
-            if (res.code == 200) {
-              // 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构
-              this.deviceInfo()
-              uni.showToast({
-                title: '操作成功',
-                icon: 'success',
-                duration: 2000,
-              })
-            } else {
-              uni.hideLoading()
-              uni.showToast({
-                title: res.msg,
-                icon: 'none',
-                duration: 2000,
-              })
-            }
+        }
+      })
+    },
+    // 关闭
+    btngb() {
+      uni.showLoading({
+        title: '设备关闭中...',
+      })
+      this.$u.put(`/app/device/admin/${this.id}/switch?open=false`).then(res => {
+        if (res.code == 200) {
+          // setTimeout(()=>{
+          // 	this.btnsx()
+          // },1000)
+          uni.showToast({
+            title: '关闭成功',
+            icon: 'success',
+            duration: 2000,
           })
-          .catch(error => {
-            console.error('Error fetching area data:', error)
+          this.powerStatus = '关闭'
+        } else {
+          uni.showToast({
+            title: '关闭失败',
+            icon: 'none',
+            duration: 2000,
           })
-      } else if (num == 3) {
-        uni.showLoading({
-          title: '加载中...',
-        })
-        this.$u.put('/bst/device/iot/ring?sn=' + this.sn).then(res => {
-          if (res.code == 200) {
-            this.deviceInfo()
-            uni.hideLoading()
-            uni.showToast({
-              title: '操作成功',
-              icon: 'success',
-              duration: 2000,
-            })
-          } else {
-            uni.hideLoading()
-            uni.showToast({
-              title: res.msg,
-              icon: 'none',
-              duration: 2000,
-            })
-          }
-        })
-      } else if (num == 4) {
-        uni.showLoading({
-          title: '加载中...',
-        })
-        this.$u.put('/bst/device/iot/refresh?sn=' + this.sn).then(res => {
-          if (res.code == 200) {
-            this.deviceInfo()
-            uni.hideLoading()
-            uni.showToast({
-              title: '操作成功',
-              icon: 'success',
-              duration: 2000,
-            })
-          } else {
-            uni.showToast({
-              title: res.msg,
-              icon: 'none',
-              duration: 2000,
-            })
-          }
-        })
-      } else if (num == 5) {
-        uni.showLoading({
-          title: '加载中...',
-        })
-        this.$u.put('/app/voltage/check?sn=' + this.sn).then(res => {
-          if (res.code == 200) {
-            this.deviceInfo()
-            uni.hideLoading()
-            uni.showToast({
-              title: '操作成功',
-              icon: 'success',
-              duration: 2000,
-            })
-          } else {
-            uni.showToast({
-              title: res.msg,
-              icon: 'none',
-              duration: 2000,
-            })
-          }
-        })
-      } else if (num == 8) {
-        uni.showLoading({
-          title: '加载中...',
-        })
-        this.$u.put('/bst/device/iot/reboot?sn=' + this.sn).then(res => {
-          if (res.code == 200) {
-            this.deviceInfo()
-            uni.hideLoading()
-            uni.showToast({
-              title: '操作成功',
-              icon: 'success',
-              duration: 2000,
-            })
-          } else {
-            uni.showToast({
-              title: res.msg,
-              icon: 'none',
-              duration: 2000,
-            })
-          }
-        })
-      } else if (num == 9) {
-        uni.showLoading({
-          title: '加载中...',
-        })
-        this.$u.put('/bst/device/iot/unlockSeat?sn=' + this.sn).then(res => {
-          if (res.code == 200) {
-            this.deviceInfo()
-            uni.hideLoading()
-            uni.showToast({
-              title: '操作成功',
-              icon: 'success',
-              duration: 2000,
-            })
-          } else {
-            uni.showToast({
-              title: res.msg,
-              icon: 'none',
-              duration: 2000,
-            })
-          }
-        })
-      }
+        }
+      })
+    },
+    // 刷新
+    btnsx() {
+      this.$u.get(`/app/device/v2/refreshIot?deviceNo=${this.storeId}`).then(res => {
+        if (res.code == 200) {
+          this.getsn()
+          uni.showToast({
+            title: '同步成功',
+            icon: 'success',
+            duration: 2000,
+          })
+        } else {
+          uni.showToast({
+            title: '同步失败',
+            icon: 'none',
+            duration: 2000,
+          })
+        }
+      })
     },
   },
 }
 </script>
 
-<style lang="scss">
-page {
-  background-color: #f7faff !important;
-}
-
-.btnbox {
-  margin-left: -66rpx;
-  width: 750rpx;
-  padding: 0 66rpx;
-  position: fixed;
-  bottom: 50rpx;
-}
-
-.txt {
-  margin-top: 16rpx;
-  font-size: 32rpx;
-  color: #808080;
-}
-
-.btn_box {
-  width: 100%;
+<style lang="less">
+.jiaozhun {
   display: flex;
-  align-items: center;
+  padding: 50rpx;
+  box-sizing: border-box;
+  width: 100%;
   justify-content: space-between;
 
-  .btn1 {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 180rpx;
-    height: 100rpx;
-    background: #8b83f0;
-    font-size: 50rpx;
+  button {
+    height: 80rpx;
+    line-height: 80rpx;
+    background-color: #8883f0;
     color: #fff;
-    border-radius: 30rpx;
+  }
+
+  .input {
+    input {
+      height: 80rpx;
+      line-height: 80rpx;
+    }
+
+    border: 1px solid #ccc;
+    border-radius: 20rpx;
+    display: flex;
+    width: 400rpx;
+    height: 80rpx;
+    text-align: center;
+  }
+
+  .view {
+    width: 200rpx;
+    height: 80rpx;
+    border-radius: 20rpx;
+    background-color: #8883f0;
+    color: #fff;
+    text-align: center;
+    line-height: 80rpx;
+    font-size: 28rpx;
   }
 }
 
-.btn2 {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 100%;
-  height: 100rpx;
-  background: #8b83f0;
-  font-size: 50rpx;
-  color: #fff;
-  border-radius: 30rpx;
+.list {
+  position: fixed;
+  bottom: 50rpx;
+  left: 50%;
+  transform: translateX(-50%);
+
+  .anniulist {
+    width: 658rpx;
+    margin: auto;
+    margin-top: 20rpx;
+    text-align: left;
+    font-size: 32rpx;
+    display: flex;
+
+    .anniu {
+      margin-right: 20rpx;
+      width: 30%;
+      height: 90rpx;
+      border-radius: 20rpx;
+      background-color: #8883f0;
+      color: #fff;
+      font-size: 32rpx;
+      text-align: center;
+      line-height: 90rpx;
+    }
+  }
+
+  .fanhui {
+    width: 658rpx;
+    height: 90rpx;
+    border-radius: 20rpx;
+    background-color: #8883f0;
+    color: #fff;
+    font-size: 32rpx;
+    text-align: center;
+    line-height: 90rpx;
+    margin: auto;
+    margin-top: 50rpx;
+  }
 }
 
-.pages {
-  padding: 0 66rpx;
-  box-sizing: border-box;
+.machao {
+  width: 658rpx;
+  margin: auto;
+  margin-top: 20rpx;
+  text-align: left;
+  font-size: 32rpx;
+}
+
+.title {
+  font-size: 70rpx;
+  font-weight: 600;
+  text-align: left;
+  width: 658rpx;
+  margin: auto;
+  margin-top: 30rpx;
+}
+
+.shuom {
+  width: 658rpx;
+  margin: auto;
+  margin-top: 30rpx;
+  text-align: left;
+  font-size: 32rpx;
 }
 
 .iptbox {
@@ -473,99 +481,4 @@ page {
     color: #808080;
   }
 }
-
-.title {
-  margin-bottom: 84rpx;
-
-  image {
-    display: inline-block;
-    width: 48rpx;
-    height: 48rpx;
-    vertical-align: bottom;
-    margin-right: 10rpx;
-  }
-
-  text:nth-child(1) {
-    font-weight: 400;
-    font-size: 96rpx;
-    color: #262b37;
-    line-height: 88rpx;
-    text-align: left;
-    font-style: normal;
-    text-transform: none;
-    display: block;
-    margin-bottom: 48rpx;
-  }
-}
-
-.dblist {
-  display: flex;
-  width: 100%;
-  margin-top: 34rpx;
-  background: #ffffff;
-  box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0, 0, 0, 0.08);
-  padding: 20rpx 0 24rpx 18rpx;
-  box-sizing: border-box;
-  text-align: center;
-  border-radius: 10rpx;
-
-  .lt {
-    padding-left: 10rpx;
-    box-sizing: border-box;
-    margin-right: 38rpx;
-
-    image {
-      width: 42rpx;
-    }
-  }
-
-  .cen {
-    width: 370rpx;
-    padding-left: 10rpx;
-    box-sizing: border-box;
-
-    .name {
-      white-space: nowrap;
-      font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
-      font-weight: 400;
-      font-size: 28rpx;
-      color: #262b37;
-      line-height: 40rpx;
-      text-align: left;
-      font-style: normal;
-      text-transform: none;
-      margin-top: 10rpx;
-    }
-
-    .mac {
-      font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
-      font-weight: 400;
-      font-size: 24rpx;
-      color: #262b37;
-      line-height: 32rpx;
-      text-align: left;
-      font-style: normal;
-      text-transform: none;
-      margin-top: 16rpx;
-    }
-  }
-
-  .rt {
-    margin-left: auto;
-    margin-top: 22rpx;
-
-    text {
-      display: inline-block;
-      width: 108rpx;
-      height: 60rpx;
-      background: rgba(255, 255, 255, 0);
-      border: 2rpx solid #8883f0;
-      filter: blur(0px);
-      border-radius: 20rpx;
-      text-align: center;
-      line-height: 60rpx;
-      color: #8883f0;
-    }
-  }
-}
 </style>
diff --git a/page_user/luru/index.vue b/page_user/luru/index.vue
index 991a3a6..9a2eaed 100644
--- a/page_user/luru/index.vue
+++ b/page_user/luru/index.vue
@@ -1,18 +1,9 @@
 <template>
   <view class="pages">
-    <u-navbar
-      :background="bgc"
-      :border-bottom="false"
-      :custom-back="backPage"
-      height="50"
-      title="添加设备"
-      title-color="#262B37"
-      title-size="38"
-    ></u-navbar>
     <view class="title">
       <view class="title_li" style="display: flex; align-items: center">
         <view class="text">设备列表</view>
-        <view class="btns" @click="toControl()"> 控制台</view>
+
         <view class="btns" @click="replay()"> 重置页面</view>
       </view>
       <image
@@ -153,13 +144,8 @@ export default {
         url: '/page_user/luru/index',
       })
     },
-    backPage() {
-      uni.switchTab({
-        url: '/pages/my',
-      })
-    },
     toControl() {
-      uni.redirectTo({
+      uni.navigateTo({
         url: '/page_user/luru/controlDevice',
       })
     },
@@ -206,7 +192,7 @@ export default {
     choose(e) {
       console.log(e)
       let Bluetoothmac = e.name.substring(5)
-      uni.redirectTo({
+      uni.navigateTo({
         url: '/page_user/luru/bind_mac?mac=' + Bluetoothmac,
       })
     },
diff --git a/pages.json b/pages.json
index 3080945..f32add1 100644
--- a/pages.json
+++ b/pages.json
@@ -119,25 +119,22 @@
         {
           "path": "luru/index",
           "style": {
-            "navigationBarTitleText": "上传",
-            "enablePullDownRefresh": false,
-            "navigationStyle": "custom"
+            "navigationBarTitleText": "添加设备",
+            "enablePullDownRefresh": false
           }
         },
         {
           "path": "luru/controlDevice",
           "style": {
-            "navigationBarTitleText": "上传",
-            "enablePullDownRefresh": false,
-            "navigationStyle": "custom"
+            "navigationBarTitleText": "设备控制",
+            "enablePullDownRefresh": false
           }
         },
         {
           "path": "luru/bind_mac",
           "style": {
-            "navigationBarTitleText": "上传",
-            "enablePullDownRefresh": false,
-            "navigationStyle": "custom"
+            "navigationBarTitleText": "添加设备",
+            "enablePullDownRefresh": false
           }
         }
       ]