diff --git a/components/da-tree-vue2/changelog.md b/components/da-tree-vue2/changelog.md
new file mode 100644
index 0000000..aef338d
--- /dev/null
+++ b/components/da-tree-vue2/changelog.md
@@ -0,0 +1,110 @@
+# 1.4.1
+
+## 版本调整
+
+建议更新，但需要注意，异步数据的时候，后台需返回 leaf 字段来判断是否末项数据
+
+1. **调整数据项格式，新增 `leaf` 字段，来判断是否为末节点**
+2. **调整数据项格式，新增 `sort` 字段，来排序节点位置**
+3. **注意：异步加载数据，当为末项的时候，需要服务端数据返回 `leaf` 字段**
+4. 新增 `alwaysFirstLoad` ，即异步数据总会在第一次展开节点时，拉取一次后台数据，来比对是否一致
+5. 拆分 `field` 属性，**注意： 1.5.0 版本后将移除 `field` 属性**
+6. 新增 `labelField` 同 `field.label`，指定节点对象中某个属性为**标签**字段，默认`label`
+7. 新增 `valueField` 同 `field.key`，指定节点对象中某个属性为**值**字段，默认`value`
+8. 新增 `childrenField` 同 `field.children`，指定节点对象中某个属性为**子树节点**字段，默认`children`
+9. 新增 `disabledField` 同 `field.disabled`，指定节点对象中某个属性为**禁用**字段，默认`disabled`
+10. 新增 `appendField` 同 `field.append`，指定节点对象中某个属性为**副标签**字段，默认`append`
+11. 新增 `leafField` 同 `field.label`，指定节点对象中某个属性为**末级节点**字段，默认`leaf`
+12. 新增 `sortField` 同 `field.label`，指定节点对象中某个属性为**排序**字段，默认`sort`
+13. 新增 `isLeafFn` ，用来自定义控制数据项的末项
+14. 更多的项目示例
+15. 支持单选取消选中
+16. 修复节点展开时可能存在的 bug
+17. 修复节点选择可能存在的 bug
+18. 调整为子节点默认继承父节点禁用属性
+19. `setExpandedKeys` 添加参数一为 `all` 即可支持一键展开/收起全部节点
+20. 其它更多优化
+
+# 1.3.4
+
+优化
+
+1. 优化图标字体命名
+
+# 1.3.3
+
+版本同步于 Vue3 版，[查看 Vue3 版更新日志](https://ext.dcloud.net.cn/plugin?id=12384&update_log)
+
+# 1.3.2
+
+版本同步于 Vue3 版，[查看 Vue3 版更新日志](https://ext.dcloud.net.cn/plugin?id=12384&update_log)
+
+# 1.3.1.1
+
+修复
+
+1. 修复 APP 兼容性引起的报错
+
+# 1.3.1
+
+## 建议更新
+
+### 1.2.2~1.3.1 更新预览
+
+1. 新增支持主题换色
+2. 新增支持点击标签也能选中节点
+3. 新增`field`字段 `append` 用于在标签后面显示小提示
+4. 方法`setExpandedKeys`支持加载动态数据
+5. 支持单选的`onlyRadioLeaf`为`true`时可点父节点展开/收起
+6. 新增 `expandChecked`，控制选择时是否展开当前已选的所有下级节点
+7. 新增 `checkedDisabled`，支持渲染禁用值
+8. 新增 `packDisabledkey`，支持返回已选中的禁用的 key
+9. 更多细节修复、优化请移步 Vue3 版的更新日志
+
+后续版本仍不会实时同步 Vue3 版本，如急需新功能，请移步 Vue3 版
+
+版本同步于 Vue3 版，[查看 Vue3 版更新日志](https://ext.dcloud.net.cn/plugin?id=12384&update_log)
+
+# 1.2.2
+
+## 建议更新，优化诸多问题
+
+版本同步于 Vue3 版，[查看 Vue3 版更新日志](https://ext.dcloud.net.cn/plugin?id=12384&update_log)
+
+# 1.2.1
+
+版本同步于 Vue3 版，[查看 Vue3 版更新日志](https://ext.dcloud.net.cn/plugin?id=12384&update_log)
+
+# 1.2.0.1
+
+优化
+
+1. 优化小程序兼容
+
+# 1.2.0
+
+版本同步于 Vue3 版，[查看 Vue3 版更新日志](https://ext.dcloud.net.cn/plugin?id=12384&update_log)
+
+# 1.1.1.1
+
+修复
+
+1. 修复同步版本的错误写法引起的报错
+
+# 1.1.1
+
+版本同步于 Vue3 版，[查看 Vue3 版更新日志](https://ext.dcloud.net.cn/plugin?id=12384&update_log)
+
+# 1.1.0
+
+版本同步于 Vue3 版，[查看 Vue3 版更新日志](https://ext.dcloud.net.cn/plugin?id=12384&update_log)
+
+# 1.0.6
+
+新增
+
+版本同步于 Vue3 版，[查看 Vue3 版更新日志](https://ext.dcloud.net.cn/plugin?id=12384&update_log)
+
+# 1.0.5
+
+版本同步于 Vue3 版，[查看 Vue3 版更新日志](https://ext.dcloud.net.cn/plugin?id=12384)，基于 Vue2 进行开发，支持单选、多选，全平台兼容。
diff --git a/components/da-tree-vue2/index.vue b/components/da-tree-vue2/index.vue
new file mode 100644
index 0000000..5144cc5
--- /dev/null
+++ b/components/da-tree-vue2/index.vue
@@ -0,0 +1,1108 @@
+<template>
+  <view class="da-tree" :style="{'--theme-color': themeColor}">
+    <scroll-view class="da-tree-scroll" :scroll-y="true" :scroll-x="false">
+      <view
+        class="da-tree-item"
+        :class="{'is-show': item.show}"
+        :style="{paddingLeft: item.level * indent + 'rpx'}"
+        v-for="item in datalist"
+        :key="item.key">
+        <view
+          v-if="item.showArrow"
+          class="da-tree-item__icon"
+          @click="handleExpandedChange(item)">
+          <view :class="['da-tree-item__icon--arr','is-loading']" v-if="loadLoading && item.loading"></view>
+          <view :class="['da-tree-item__icon--arr','is-expand', {'is-right':!item.expand}]" v-else></view>
+        </view>
+        <view v-else class="da-tree-item__icon"></view>
+        <view
+          class="da-tree-item__checkbox"
+          :class="[`da-tree-item__checkbox--${checkboxPlacement}`,{'is--disabled': item.disabled}]"
+          v-if="showCheckbox"
+          @click="handleCheckChange(item)">
+          <view class="da-tree-item__checkbox--icon da-tree-checkbox-checked" v-if="item.checkedStatus === isCheckedStatus"></view>
+          <view class="da-tree-item__checkbox--icon da-tree-checkbox-indeterminate" v-else-if="item.checkedStatus === halfCheckedStatus"></view>
+          <view class="da-tree-item__checkbox--icon da-tree-checkbox-outline" v-else></view>
+        </view>
+        <view
+          class="da-tree-item__checkbox"
+          :class="[`da-tree-item__checkbox--${checkboxPlacement}`,{'is--disabled': item.disabled}]"
+          v-if="!showCheckbox && showRadioIcon"
+          @click="handleRadioChange(item)">
+          <view class="da-tree-item__checkbox--icon da-tree-radio-checked" v-if="item.checkedStatus === isCheckedStatus"></view>
+          <view class="da-tree-item__checkbox--icon da-tree-radio-indeterminate" v-else-if="item.checkedStatus === halfCheckedStatus"></view>
+          <view class="da-tree-item__checkbox--icon da-tree-radio-outline" v-else></view>
+        </view>
+        <view class="da-tree-item__label" :class="'da-tree-item__label--'+item.checkedStatus" @click="handleLabelClick(item)">{{ item.label }} <text class="da-tree-item__label--append" v-if="item.append">{{ item.append }}</text></view>
+      </view>
+    </scroll-view>
+  </view>
+</template>
+
+<script>
+import {
+  unCheckedStatus,
+  halfCheckedStatus,
+  isCheckedStatus,
+  deepClone,
+  getAllNodeKeys,
+  getAllNodes,
+  logError,
+  isArray,
+  isString,
+  isNumber,
+  isFunction,
+} from './utils'
+import basicProps from './props'
+
+export default {
+  name: 'DaTree',
+  props: basicProps,
+  data() {
+    return {
+      unCheckedStatus,
+      halfCheckedStatus,
+      isCheckedStatus,
+      /** 原始的树数据 */
+      dataRef: [],
+      /** 处理后的一维树项数据 */
+      datalist: [],
+      /** 处理后的以key为键值的树项数据 */
+      datamap: {},
+      /** 默认的展开数据 */
+      expandedKeys: [],
+      /** 默认的已选数据 */
+      checkedKeys: null,
+      /** 加载状态 */
+      loadLoading: false,
+      fieldMap: {
+        value: 'value',
+        label: 'label',
+        children: 'children',
+        disabled: 'disabled',
+        append: 'append',
+        leaf: 'leaf',
+        sort: 'sort',
+      },
+    }
+  },
+  watch: {
+    defaultExpandedKeys: {
+      // deep: true,
+      immediate: true,
+      handler: function(v) {
+        if (v?.length) {
+          this.expandedKeys = v
+        } else {
+          this.expandedKeys = []
+        }
+
+        // if (v) this.checkInitData(this.datalist)
+      },
+    },
+    defaultCheckedKeys: {
+      // deep: true,
+      immediate: true,
+      handler: function(v) {
+        if (this.showCheckbox) {
+          if (v?.length) {
+            this.checkedKeys = v
+          } else {
+            this.checkedKeys = []
+          }
+        } else {
+          if (v || v === 0) {
+            this.checkedKeys = v
+          } else {
+            this.checkedKeys = null
+          }
+        }
+        // this.checkInitData(this.datalist)
+      },
+    },
+    data: {
+      deep: true,
+      immediate: true,
+      handler: function(v) {
+        this.dataRef = deepClone(v)
+        setTimeout(() => {
+          this.initData()
+        }, 36)
+      },
+    },
+  },
+  methods: {
+    /**
+     * 初始化数据结构
+     */
+    initData() {
+      this.fieldMap = {
+        value: this.field?.key || this.field?.value || this.valueField || 'value',
+        label: this.field?.label || this.labelField || 'label',
+        children: this.field?.children || this.childrenField || 'children',
+        disabled: this.field?.disabled || this.disabledField || 'disabled',
+        append: this.field?.append || this.appendField || 'append',
+        leaf: this.field?.leaf || this.leafField || 'leaf',
+        sort: this.field?.sort || this.sortField || 'sort',
+      }
+
+      const data = deepClone(this.dataRef)
+      this.datalist = []
+      this.datamap = {}
+
+      // clean tree
+      this.handleTreeData(data)
+      // flat tree
+      this.datalist = this.checkInitData(this.datalist)
+
+      console.log('init datalist', this.datalist)
+      console.log('init datamap', this.datamap)
+    },
+
+    /**
+     * 转换为节点数据
+     * @param data
+     * @param parent
+     * @param level
+     */
+    handleTreeData(data = [], parent = null, level = 0, insertIndex = -1) {
+      return data.reduce((prev, cur, index) => {
+        const key = cur[this.fieldMap.value]
+        const children = cur[this.fieldMap.children] || null
+        const newItem = this.createNewItem(cur, index, parent, level)
+        if (insertIndex > -1) {
+          // 插入子项尾部
+          const index = (parent.childrenKeys?.length || 0) + insertIndex + 1
+          if (!parent?.childrenKeys?.includes(key)) {
+            this.datamap[key] = newItem
+            this.datalist.splice(index, 0, newItem)
+            parent.children.push(newItem)
+            if (newItem.parentKeys?.length) {
+              newItem.parentKeys.forEach(k => {
+                this.datamap[k].childrenKeys = [...this.datamap[k].childrenKeys, newItem.key]
+              })
+            }
+          }
+        } else {
+          this.datamap[key] = newItem
+          this.datalist.push(newItem)
+        }
+
+        const hasChildren = children && children.length > 0
+        if (hasChildren) {
+          const childrenData = this.handleTreeData(children, newItem, level + 1)
+          // childrenData.sort((a, b) => a.sort - b.sort)
+          newItem.children = childrenData
+          const childrenKeys = childrenData.reduce((p, k) => {
+            const keys = k.childrenKeys
+            p.push(...keys, k.key)
+            return p
+          }, [])
+          newItem.childrenKeys = childrenKeys
+        }
+        prev.push(newItem)
+        return prev
+      }, [])
+    },
+
+    /**
+     * 创建节点
+     * @param item
+     * @param index
+     * @param parent
+     * @param level
+     */
+    createNewItem(item, index, parent, level) {
+      const key = item[this.fieldMap.value]
+      const label = item[this.fieldMap.label]
+      const sort = item[this.fieldMap.sort] || 0
+      const children = item[this.fieldMap.children] || null
+      const append = item[this.fieldMap.append] || null
+      let disabled = item[this.fieldMap.disabled] || false
+      // 优先继承父级禁用属性
+      disabled = parent?.disabled || disabled
+      let isLeaf = isFunction(this.isLeafFn) ? this.isLeafFn(item) : (item[this.fieldMap.leaf] || false)
+      // const hasChildren = children && children.length > 0
+      const isEmptyChildren = children && children.length === 0
+      let showArrow = true
+      // let isLeaf = !hasChildren
+      let expand = this.defaultExpandAll || false
+      // 是否异步加载模式
+      const isLoadMode = this.loadMode && isFunction(this.loadApi)
+
+      if (!children) {
+        expand = false
+        if (isLoadMode) {
+          showArrow = true
+        } else {
+          isLeaf = true
+          showArrow = false
+        }
+      }
+
+      if (isEmptyChildren) {
+        expand = false
+        if (isLoadMode) {
+          showArrow = true
+        } else {
+          isLeaf = true
+          showArrow = false
+        }
+      }
+
+      if (isLeaf) {
+        showArrow = false
+        expand = false
+      } else {
+        showArrow = true
+      }
+
+      // onlyRadioLeaf 单选只能选择末级节点
+      if (!this.showCheckbox) {
+        if (this.onlyRadioLeaf) {
+          if (!isLeaf) {
+            disabled = true
+          } else {
+            // 仍旧继承父类原始禁用状态
+            disabled = parent?.originItem?.disabled || false
+          }
+        }
+      }
+
+      if (disabled) {
+        if (isLeaf || !children || isEmptyChildren) {
+          expand = false
+          showArrow = false
+        }
+      }
+
+      const parentKey = parent ? parent.key : null
+      const show = this.defaultExpandAll || level === 0
+
+      const newItem = {
+        key,
+        parentKey,
+        label,
+        append,
+        isLeaf,
+        showArrow,
+        level,
+        expand,
+        show,
+        sort,
+        disabled,
+        loaded: false,
+        loading: false,
+        indexs: [index],
+        checkedStatus: unCheckedStatus,
+        parentKeys: [],
+        childrenKeys: [],
+        children: [],
+        originItem: item,
+      }
+
+      if (parent) {
+        newItem.parentKeys = [parent.key, ...parent.parentKeys]
+        newItem.indexs = [...parent.indexs, index]
+      }
+
+      return newItem
+    },
+
+    /**
+     * 处理初始化内容
+     * @param list
+     */
+    checkInitData(list) {
+      let checkedKeyList = null
+      let expandedKeyList = []
+      if (this.showCheckbox) {
+        checkedKeyList = [...new Set(this.checkedKeys || [])]
+        expandedKeyList = this.expandChecked ? ([...(this.checkedKeys || []), ...(this.expandedKeys || [])]) : this.expandedKeys
+      } else {
+        checkedKeyList = this.checkedKeys || null
+        expandedKeyList = this.expandChecked && this.checkedKeys ? ([this.checkedKeys, ...(this.expandedKeys || [])]) : this.expandedKeys
+      }
+
+      this.handleCheckState(list, checkedKeyList, true)
+
+      // 处理初始展开
+      expandedKeyList = [...new Set(expandedKeyList)]
+      if (!this.defaultExpandAll) {
+        this.handleExpandState(list, expandedKeyList, true)
+      }
+
+      list.sort((a, b) => {
+        if (a.sort === 0 && b.sort === 0) {
+          return 0
+        }
+
+        if (a.parentKey === b.parentKey) {
+          if (a.sort - b.sort > 0) {
+            return 1
+          } else {
+            return -1
+          }
+        }
+
+        return 0
+      })
+
+      return list
+    },
+
+    /**
+     * 处理选中
+     * @param list
+     * @param checkedKeyList
+     */
+    handleCheckState(list, checkedKeyList, checked = true) {
+      // 多选
+      if (this.showCheckbox) {
+        if (checkedKeyList?.length) {
+          checkedKeyList.forEach(k => {
+            const item = this.datamap[k]
+            if (item) {
+              this.checkTheChecked(item, checked)
+            }
+          })
+        }
+
+        return
+      }
+
+      // 单选
+      for (let i = 0; i < list.length; i++) {
+        const item = list[i]
+        if (item.key === checkedKeyList) {
+          // console.log('item.key === checkedKeyList', item.key, checkedKeyList)
+          this.checkTheRadio(item, checked)
+          break
+        }
+      }
+    },
+
+    /**
+     * 校验多选节点
+     * @param item
+     * @param checked
+     */
+    checkTheChecked(item, checked = true) {
+      const { childrenKeys, parentKeys, disabled = false } = item
+      if (!this.checkedDisabled && disabled) return
+
+      // 当前
+      item.checkedStatus = checked ? isCheckedStatus : unCheckedStatus
+
+      if (!this.checkStrictly) {
+        // 子类
+        childrenKeys.forEach(k => {
+          const childrenItem = this.datamap[k]
+          childrenItem.checkedStatus = (!this.checkedDisabled && childrenItem.disabled) ? childrenItem.checkedStatus : item.checkedStatus
+        })
+
+        // 父类
+        parentKeys.forEach(k => {
+          const parentItem = this.datamap[k]
+          parentItem.checkedStatus = this.getParentCheckedStatus(parentItem)
+        })
+      }
+    },
+
+    /**
+     * 校验单选节点
+     * @param item
+     */
+    checkTheRadio(item, checked) {
+      const { parentKeys, isLeaf, disabled = false } = item
+      if (!this.checkedDisabled && disabled) return
+
+      // 限制末节点选中，但当前非末节点
+      if (this.onlyRadioLeaf && !isLeaf) {
+        logError(`限制了末节点选中，当前[${item.label}]非末节点`)
+        return
+      }
+
+      if (this.datalist?.length) {
+        this.datalist.forEach(k => {
+          k.checkedStatus = unCheckedStatus
+        })
+      }
+      console.log('000', item, parentKeys, this.datamap)
+
+      parentKeys.forEach(k => {
+        console.log('kkk', k, this.datamap[k])
+        const parentItem = this.datamap[k]
+        parentItem.checkedStatus = checked ? this.getParentCheckedStatus(parentItem) : unCheckedStatus
+      })
+
+      // 当前
+      item.checkedStatus = checked ? isCheckedStatus : unCheckedStatus
+    },
+
+    /**
+     * 处理父节点展开
+     * @param item
+     * @param expand
+     */
+    // handleExpandParentNode(item, expand = true) {
+    //   if (!expand) return
+
+    //   if (item?.parentKeys?.length) {
+    //     item.parentKeys.forEach(pk => {
+    //       if (!this.datamap[pk].expand) {
+    //         this.datamap[pk].expand = true
+    //       }
+    //     })
+    //   }
+    // },
+
+    /**
+     * 处理节点展开
+     * @param list
+     * @param expandedKeyList
+     * @param expand
+     */
+    handleExpandState(list, expandedKeyList, expand = true) {
+      // 收起
+      if (expand === false) {
+        for (let i = 0; i < list.length; i++) {
+          const item = list[i]
+          if (expandedKeyList?.includes(item.key)) {
+            item.expand = false
+            if (item.childrenKeys?.length) {
+              item.childrenKeys.forEach(ck => {
+                this.datamap[ck].expand = false
+                this.datamap[ck].show = false
+              })
+            }
+          }
+        }
+        return
+      }
+      // 展开
+      for (let i = 0; i < list.length; i++) {
+        const item = list[i]
+        // 处理展开
+        if (expandedKeyList?.includes(item.key)) {
+          // 父子
+          item.expand = true
+          if (item.children?.length) {
+            item.children.forEach(k => {
+              const kItem = this.datamap[k.key]
+              kItem.show = true
+            })
+          }
+
+          // 族系
+          if (item.parentKeys?.length) {
+            item.parentKeys.forEach(k => {
+              const kItem = this.datamap[k]
+              kItem.expand = true
+              if (kItem.children?.length) {
+                kItem.children.forEach(k => {
+                  const skItem = this.datamap[k.key]
+                  skItem.show = true
+                })
+              }
+            })
+          }
+        }
+      }
+    },
+
+    /**
+     * 点击选框
+     * @param item
+     */
+    handleCheckChange(item) {
+      const { childrenKeys, parentKeys, checkedStatus, isLeaf, disabled = false } = item
+      if (!this.showCheckbox) return
+      if (disabled) return
+
+      // 当前
+      item.checkedStatus = checkedStatus === isCheckedStatus ? unCheckedStatus : isCheckedStatus
+
+      // 子类
+      if (!this.checkStrictly) {
+        if (this.expandChecked) {
+          item.show = true
+          item.expand = childrenKeys?.length > 0 || isLeaf
+        }
+
+        childrenKeys.forEach(k => {
+          const childrenItem = this.datamap[k]
+          childrenItem.checkedStatus = childrenItem.disabled ? childrenItem.checkedStatus : item.checkedStatus
+
+          if (this.expandChecked) {
+            childrenItem.show = true
+            childrenItem.expand = childrenItem?.childrenKeys?.length > 0 || childrenItem.isLeaf
+          }
+        })
+      } else {
+        if (this.expandChecked) {
+          logError(`多选时，当 checkStrictly 为 true 时，不支持选择自动展开子节点属性(expandChecked)`)
+        }
+      }
+
+      // 父类
+      if (!this.checkStrictly) {
+        parentKeys.forEach(k => {
+          const parentItem = this.datamap[k]
+          parentItem.checkedStatus = this.getParentCheckedStatus(parentItem)
+        })
+      }
+
+      const hasCheckedKeys = []
+      for (let i = 0; i < this.datalist.length; i++) {
+        const k = this.datalist[i]
+        if (k.checkedStatus === isCheckedStatus) {
+          if ((this.packDisabledkey && k.disabled) || !k.disabled) {
+            hasCheckedKeys.push(k.key)
+          }
+        }
+      }
+
+      this.checkedKeys = [...hasCheckedKeys]
+
+      this.$emit('change', hasCheckedKeys, item)
+    },
+
+    /**
+     * 点击单选
+     * @param item
+     */
+    handleRadioChange(item) {
+      const { parentKeys, checkedStatus, key, disabled = false, isLeaf } = item
+      if (this.showCheckbox) return
+      if (this.onlyRadioLeaf && !isLeaf) this.handleExpandedChange(item)
+
+      if (disabled) return
+
+      // 重置所有选择
+      if (this.datalist?.length) {
+        for (let i = 0; i < this.datalist.length; i++) {
+          const k = this.datalist[i]
+          k.checkedStatus = unCheckedStatus
+        }
+      }
+
+      parentKeys.forEach(k => {
+        const parentItem = this.datamap[k]
+        parentItem.checkedStatus = this.getParentCheckedStatus(parentItem)
+      })
+
+      // 当前
+      item.checkedStatus = checkedStatus === isCheckedStatus ? unCheckedStatus : isCheckedStatus
+
+      this.checkedKeys = key
+      this.$emit('change', key, item)
+    },
+
+    /**
+     * 点击标签
+     */
+    handleLabelClick(item) {
+      if (this.showCheckbox) {
+        this.handleCheckChange(item)
+      } else {
+        this.handleRadioChange(item)
+      }
+    },
+
+    /**
+     * 点击展开收起
+     * @param item
+     */
+    async handleExpandedChange(item) {
+      const { expand, loading = false, disabled } = item
+      if (this.loadLoading && loading) return
+
+      this.checkExpandedChange(item)
+
+      // 异步
+      item.expand = !expand
+
+      let currentItem = null
+      if (!disabled) {
+        if (!this.showCheckbox && this.onlyRadioLeaf && this.loadMode) {
+          logError(`单选时，当 onlyRadioLeaf 为 true 时不支持动态数据`)
+        } else {
+          currentItem = await this.loadExpandNode(item)
+        }
+      }
+
+      this.$emit('expand', !expand, currentItem || item || null)
+    },
+
+    /**
+     * 检查展开状态
+     * @param item
+     */
+    checkExpandedChange(item) {
+      const { expand, childrenKeys, children = null } = item
+
+      if (expand) {
+        if (childrenKeys?.length) {
+          childrenKeys.forEach(k => {
+            if (this.datamap[k]) {
+              this.datamap[k].show = false
+              this.datamap[k].expand = false
+            }
+          })
+        }
+      } else {
+        if (children?.length) {
+          const childrenKeys = children.map(k => k.key)
+          childrenKeys.forEach(k => {
+            if (this.datamap[k]) {
+              this.datamap[k].show = true
+            }
+          })
+        }
+      }
+    },
+
+    /**
+     * 加载异步数据
+     * @param item
+     */
+    async loadExpandNode(item) {
+      const { expand, key, loaded, children } = item
+      if (children?.length && !this.alwaysFirstLoad) {
+        return item
+      }
+
+      if (expand && this.loadMode && !loaded) {
+        if (isFunction(this.loadApi)) {
+          this.expandedKeys.push(key)
+          this.loadLoading = true
+          item.loading = true
+
+          const currentNode = deepClone(item)
+          const apiRes = await this.loadApi(currentNode)
+
+          // 新增子项
+          let newChildren = [...(item.originItem?.children || []), ...(apiRes || [])]
+          const newChildrenObj = {}
+          newChildren = newChildren.reduce((total, next) => {
+            newChildrenObj[next[this.fieldMap]] ? '' : newChildrenObj[next[this.fieldMap]] = true && total.push(next)
+            return total
+          }, [])
+
+          item.originItem.children = newChildren || null
+          if (apiRes?.length) {
+            const insertIndex = this.datalist.findIndex(k => k.key === item.key)
+            this.handleTreeData(apiRes, item, item.level + 1, insertIndex)
+            this.datalist = this.checkInitData(this.datalist)
+          } else {
+            // 加载后无数据就移除展开图标
+            item.expand = false
+            item.isLeaf = true
+            item.showArrow = false
+          }
+
+          this.loadLoading = false
+          item.loading = false
+          item.loaded = true
+        }
+      } else {
+        const eki = this.expandedKeys.findIndex(k => k === key)
+        if (eki >= 0) {
+          this.expandedKeys.splice(eki, 1)
+        }
+      }
+
+      return item
+    },
+
+    /**
+     * 获取父类的选中状态
+     * @param item
+     */
+    getParentCheckedStatus(item) {
+      if (!item) {
+        return unCheckedStatus
+      }
+
+      if (!this.checkedDisabled && item.disabled) {
+        return item.checkedStatus || unCheckedStatus
+      }
+
+      // 单选时，父类永远为半选
+      if (!this.showCheckbox) {
+        return halfCheckedStatus
+      }
+
+      const { children } = item
+      // 子类全选中
+      const childrenCheckedAll = children.every(k => k.checkedStatus === isCheckedStatus)
+      if (childrenCheckedAll) {
+        return isCheckedStatus
+      }
+
+      // 子类全不选中
+      const childrenUncheckedAll = children.every(k => k.checkedStatus === unCheckedStatus)
+      if (childrenUncheckedAll) {
+        return unCheckedStatus
+      }
+
+      return halfCheckedStatus
+    },
+    /**
+     * 返回已选的 key
+     */
+    getCheckedKeys() {
+      return getAllNodeKeys(this.datalist, 'checkedStatus', isCheckedStatus, this.packDisabledkey)
+    },
+    /**
+     * 根据key设置已选
+     * @param keys 多选时为key的数组，单选时为key
+     * @param checked 多选时为key的数组，单选时为key
+     */
+    setCheckedKeys(keys, checked = true) {
+      // 多选
+      if (this.showCheckbox) {
+        if (!isArray(keys)) {
+          logError(`setCheckedKeys 第一个参数非数组，传入的是[${keys}]`)
+          return
+        }
+
+        const list = this.datalist
+
+        // 取消选择
+        if (checked === false) {
+          let newCheckedKeys = []
+          for (let i = 0; i < this.checkedKeys.length; i++) {
+            const ck = this.checkedKeys[i]
+            if (!keys.includes(ck)) {
+              newCheckedKeys.push(ck)
+            }
+          }
+          newCheckedKeys = [...new Set(newCheckedKeys)]
+          this.checkedKeys = newCheckedKeys
+          this.handleCheckState(list, keys, false)
+
+          return
+        }
+
+        // 选择
+        const newCheckedKeys = [...this.checkedKeys, ...keys]
+        this.checkedKeys = [...new Set(newCheckedKeys)]
+        this.handleCheckState(list, this.checkedKeys, true)
+
+        if (this.expandChecked && checked) {
+          this.expandedKeys = [...new Set([...(this.checkedKeys || []), ...(keys || [])])]
+          this.handleExpandState(list, keys, true)
+        }
+        return
+      }
+
+      // 单选
+      // 如果为数组则拿第一个
+      if (isArray(keys)) {
+        keys = keys[0]
+      }
+
+      if (!isString(keys) && !isNumber(keys)) {
+        logError('setCheckedKeys 第一个参数字符串或数字，传入的是==>', keys)
+        return
+      }
+
+      const list = this.datalist
+      this.checkedKeys = checked ? keys : null
+
+      if (this.expandChecked && checked) {
+        this.handleExpandState(list, [keys], true)
+      }
+
+      this.handleCheckState(list, keys, !!checked)
+    },
+    /**
+     * 返回半选的 key
+     */
+    getHalfCheckedKeys() {
+      return getAllNodeKeys(this.datalist, 'checkedStatus', halfCheckedStatus, this.packDisabledkey)
+    },
+    /**
+     * 返回未选的 key
+     */
+    getUncheckedKeys() {
+      return getAllNodeKeys(this.datalist, 'checkedStatus', unCheckedStatus, this.packDisabledkey)
+    },
+    /**
+     * 返回已展开的 key
+     */
+    getExpandedKeys() {
+      return getAllNodeKeys(this.datalist, 'expand', true)
+    },
+    /**
+     * 根据key展开/收起
+     * @param keys key的数组，或字符串 all
+     * @param expand true为展开/false为收起
+     */
+    setExpandedKeys(keys, expand = true) {
+      if (!Array.isArray(keys) && keys !== 'all') {
+        logError('setExpandedKeys 第一个参数非数组，传入的是===>', keys)
+        return
+      }
+      const list = this.datalist
+
+      // 展开/收起全部
+      if (keys === 'all') {
+        list.forEach(k => {
+          k.expand = expand
+          if (k.level > 0) {
+            k.show = expand
+          }
+        })
+        return
+      }
+
+      // 收起
+      if (expand === false) {
+        const newExpandedKeys = []
+        for (let i = 0; i < this.expandedKeys.length; i++) {
+          const ek = this.expandedKeys[i]
+          if (!keys.includes(ek)) {
+            newExpandedKeys.push(ek)
+          }
+        }
+        this.expandedKeys = [...new Set(newExpandedKeys)]
+        this.handleExpandState(list, keys, false)
+
+        return
+      }
+
+      // 展开
+      const newExpandedKeys = []
+      for (let i = 0; i < list.length; i++) {
+        if (keys.includes(list[i].key)) {
+          newExpandedKeys.push(list[i].key)
+        }
+      }
+      this.expandedKeys = [...new Set(newExpandedKeys)]
+      this.handleExpandState(list, newExpandedKeys, true)
+    },
+    /**
+     * 返回未展开的 key
+     */
+    getUnexpandedKeys() {
+      return getAllNodeKeys(this.datalist, 'expand', false)
+    },
+    /**
+     * 返回已选的节点
+     */
+    getCheckedNodes() {
+      return getAllNodes(this.datalist, 'checkedStatus', isCheckedStatus, this.packDisabledkey)
+    },
+    /**
+     * 返回半选的节点
+     */
+    getHalfCheckedNodes() {
+      return getAllNodes(this.datalist, 'checkedStatus', halfCheckedStatus, this.packDisabledkey)
+    },
+    /**
+     * 返回未选的节点
+     */
+    getUncheckedNodes() {
+      return getAllNodes(this.datalist, 'checkedStatus', unCheckedStatus, this.packDisabledkey)
+    },
+    /**
+     * 返回已展开的节点
+     */
+    getExpandedNodes() {
+      return getAllNodes(this.datalist, 'expand', true)
+    },
+    /**
+     * 返回未展开的节点
+     */
+    getUnexpandedNodes() {
+      return getAllNodes(this.datalist, 'expand', false)
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+@font-face {
+  font-family: 'da-tree-iconfont'; /* Project id  */
+  src: url('data:application/octet-stream;base64,AAEAAAALAIAAAwAwR1NVQiCLJXoAAAE4AAAAVE9TLzI8GU+XAAABjAAAAGBjbWFwahLuHAAAAhQAAAIQZ2x5ZtAAFwYAAAQ8AAAEWGhlYWQkfWz8AAAA4AAAADZoaGVhB94DiwAAALwAAAAkaG10eCgAAAAAAAHsAAAAKGxvY2EE3AQOAAAEJAAAABZtYXhwAR0AoAAAARgAAAAgbmFtZRCjPLAAAAiUAAACZ3Bvc3TfNfUGAAAK/AAAALsAAQAAA4D/gABcBAAAAAAABAAAAQAAAAAAAAAAAAAAAAAAAAoAAQAAAAEAAJx55T9fDzz1AAsEAAAAAADgrxSAAAAAAOCvFIAAAP/VBAADKgAAAAgAAgAAAAAAAAABAAAACgCUAAkAAAAAAAIAAAAKAAoAAAD/AAAAAAAAAAEAAAAKADAAPgACREZMVAAObGF0bgAaAAQAAAAAAAAAAQAAAAQAAAAAAAAAAQAAAAFsaWdhAAgAAAABAAAAAQAEAAQAAAABAAgAAQAGAAAAAQAAAAQEAAGQAAUAAAKJAswAAACPAokCzAAAAesAMgEIAAACAAUDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFBmRWQAwOYE7McDgP+AAAAD3ACAAAAAAQAAAAAAAAAAAAAAAAACBAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAAAAAUAAAADAAAALAAAAAQAAAGUAAEAAAAAAI4AAwABAAAALAADAAoAAAGUAAQAYgAAABAAEAADAADmBOfx6k/q1evO7MXsx///AADmBOfx6k/q1OvO7MTsx///AAAAAAAAAAAAAAAAAAAAAQAQABAAEAAQABIAEgAUAAAAAQAIAAIAAwAEAAUABgAHAAkAAAEGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAHwAAAAAAAAACQAA5gQAAOYEAAAAAQAA5/EAAOfxAAAACAAA6k8AAOpPAAAAAgAA6tQAAOrUAAAAAwAA6tUAAOrVAAAABAAA684AAOvOAAAABQAA7MQAAOzEAAAABgAA7MUAAOzFAAAABwAA7McAAOzHAAAACQAAAAAALgBgAIoArgDSAQIBJgH+AiwAAAABAAAAAANZAkoAGQAAATIeAQYHDgEHDgImJyYvAiYnLgE+ATM3AxsXHQkJEEB3Nw8pKigNHyFFQiAdDQgJGxa2AkoSHCQRR4g8EBEBDhAiI0dGIyAPIRsRAQAAAAMAAP/VA6sDKgAIABEAGgAAARQGIiY0NjIWAzI2ECYgBhAWEzIWEAYgJhA2AoBMaExMaEyAjMrK/ujKyoyw+vr+oPr6AYA0TExoTEz+dsoBGMrK/ujKAwD6/qD6+gFg+gAAAAACAAAAAAOAAwAABQAVAAAlAScBJwcBMhYVERQGIyEiJjURNDYzAaoBgDz+vJg8AlQkMjIk/awkMjIkqgGAPv68mDwBgDQi/awiNDQiAlQiNAAAAAACAAAAAAOAAwAADwATAAABMhYVERQGIyEiJjURNDYzBSERIQMqIjQ0Iv2sIjQ0IgJU/awCVAMANCL9rCI0NCICVCI0Vv2sAAACAAAAAAOAAwAAAwATAAABNSEVATIWFREUBiMhIiY1ETQ2MwLW/lQCACI0NCL9rCI0NCIBVlRUAao0Iv2sIjQ0IgJUIjQAAAADAAD/1QOrAyoACAARABoAACUyNhAmIAYQFhMyFhAGICYQNhcyFhQGIiY0NgIAjMrK/ujKyoyw+vr+oPr6sFh+frB+firKARjKyv7oygMA+v6g+voBYPrUfrB+frB+AAACAAD/1QOrAyoACAARAAAlMjYQJiAGEBYTMhYQBiAmEDYCAIzKyv7oysqMsPr6/qD6+irKARjKyv7oygMA+v6g+voBYPoAAAAJAAAAAANpAwEAHAA0AEgAWQBqAHUAfgCSAJMAAAEUFhcWFxYyNzY3Njc2NTQmJyYnJiIHBgcGBwYVBxQeARcWMzI+ATc2NTQuAScmIyIOAQcGExQWFx4BMj4CNCYnLgEiDgEHBhcUHgIyPgI0LgIiDgI3FBcWMzI3NjU0JyYjIgcGBzcGFjI2NCYiBw4BJxQWMjY0JiIGJxQWFxYzMjY3NjU0JicmIyIGBwYVASYUDxMUFTEVGQ4TBggUDxMUFTEVGQ4TBgimDh8SFBEUIx8HBw4fERUREyQfBghZDgsPHiceHQsNDA4fJx4dBAfyCxUdHx0VCwsVHR8dFAzMEhMcGhUTExMcGRYSAV8BIy8jIy8RCAkHGSMZGSMZVAUECQ0GDAQJBQQKDAYNAwkCixksDxMGCQkMDRMTFxYZLA8TBgkJDA0TExsT5BQkHgcIDx4SFRETJB4HCA8eEg7+6xQfDA4LDBsdJyALDwsNGw4WZxAdFQsLFR0fHRUMDBUdTBoVExMSHRkWExMWGakXIyIvIxEIFpMRGRkjGBhfBgwECQUECgwGDQMJBQQHDwAAAAABAAAAAALGAtkAGQAAATQ+ARYXHgEXHgIGBwYPAgYHDgEuATUnATYSHCQRR4g8EBEBDhAiI0dGIyAPIRsRAQKbFx0JCRBAdzcPKSooDR8hREMgHQ0ICRsWtgAAAAAAEgDeAAEAAAAAAAAAEwAAAAEAAAAAAAEACAATAAEAAAAAAAIABwAbAAEAAAAAAAMACAAiAAEAAAAAAAQACAAqAAEAAAAAAAUACwAyAAEAAAAAAAYACAA9AAEAAAAAAAoAKwBFAAEAAAAAAAsAEwBwAAMAAQQJAAAAJgCDAAMAAQQJAAEAEACpAAMAAQQJAAIADgC5AAMAAQQJAAMAEADHAAMAAQQJAAQAEADXAAMAAQQJAAUAFgDnAAMAAQQJAAYAEAD9AAMAAQQJAAoAVgENAAMAAQQJAAsAJgFjQ3JlYXRlZCBieSBpY29uZm9udGljb25mb250UmVndWxhcmljb25mb250aWNvbmZvbnRWZXJzaW9uIDEuMGljb25mb250R2VuZXJhdGVkIGJ5IHN2ZzJ0dGYgZnJvbSBGb250ZWxsbyBwcm9qZWN0Lmh0dHA6Ly9mb250ZWxsby5jb20AQwByAGUAYQB0AGUAZAAgAGIAeQAgAGkAYwBvAG4AZgBvAG4AdABpAGMAbwBuAGYAbwBuAHQAUgBlAGcAdQBsAGEAcgBpAGMAbwBuAGYAbwBuAHQAaQBjAG8AbgBmAG8AbgB0AFYAZQByAHMAaQBvAG4AIAAxAC4AMABpAGMAbwBuAGYAbwBuAHQARwBlAG4AZQByAGEAdABlAGQAIABiAHkAIABzAHYAZwAyAHQAdABmACAAZgByAG8AbQAgAEYAbwBuAHQAZQBsAGwAbwAgAHAAcgBvAGoAZQBjAHQALgBoAHQAdABwADoALwAvAGYAbwBuAHQAZQBsAGwAbwAuAGMAbwBtAAACAAAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoBAgEDAQQBBQEGAQcBCAEJAQoBCwAIeGlhbmd4aWEGYWRqdXN0CGNoZWNrYm94FGNoZWNrYm94b3V0bGluZWJsYW5rFWluZGV0ZXJtaW5hdGVjaGVja2JveBJyYWRpb2J1dHRvbmNoZWNrZWQUcmFkaW9idXR0b251bmNoZWNrZWQHbG9hZGluZw14aWFuZ3hpYS1jb3B5AAAA') format('truetype');
+}
+
+.da-tree {
+  width: 100%;
+  height: 100%;
+
+  &-scroll {
+    width: 100%;
+    height: 100%;
+  }
+
+  &-item {
+    display: flex;
+    align-items: center;
+    height: 0;
+    padding: 0;
+    overflow: hidden;
+    font-size: 28rpx;
+    line-height: 1;
+    visibility: hidden;
+    opacity: 0;
+    transition: opacity 0.2s linear;
+
+    &.is-show {
+      height: auto;
+      padding: 12rpx 24rpx;
+      visibility: visible;
+      opacity: 1;
+    }
+
+    &__icon {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 40rpx;
+      height: 40rpx;
+      overflow: hidden;
+
+      &--arr {
+        position: relative;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 32rpx;
+        height: 32rpx;
+
+        &::after {
+          position: relative;
+          z-index: 1;
+          overflow: hidden;
+          /* stylelint-disable-next-line font-family-no-missing-generic-family-keyword */
+          font-family: 'da-tree-iconfont' !important;
+          font-size: 32rpx;
+          font-style: normal;
+          color: #999;
+          -webkit-font-smoothing: antialiased;
+          -moz-osx-font-smoothing: grayscale;
+        }
+
+        &.is-expand {
+          &::after {
+            content: '\e604';
+          }
+        }
+
+        &.is-right {
+          transform: rotate(-90deg);
+        }
+
+        &.is-loading {
+          animation: IconLoading 1s linear 0s infinite;
+
+          &::after {
+            content: '\e7f1';
+          }
+        }
+      }
+    }
+
+    &__checkbox {
+      width: 40rpx;
+      height: 40rpx;
+      overflow: hidden;
+
+      &--left {
+        order: 0;
+      }
+
+      &--right {
+        order: 1;
+      }
+
+      &--icon {
+        position: relative;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 40rpx;
+        height: 40rpx;
+
+        &::after {
+          position: relative;
+          top: 0;
+          left: 0;
+          z-index: 1;
+          overflow: hidden;
+          /* stylelint-disable-next-line font-family-no-missing-generic-family-keyword */
+          font-family: 'da-tree-iconfont' !important;
+          font-size: 32rpx;
+          font-style: normal;
+          -webkit-font-smoothing: antialiased;
+          -moz-osx-font-smoothing: grayscale;
+        }
+
+        &.da-tree-checkbox-outline::after {
+          color: #bbb;
+          content: '\ead5';
+        }
+
+        &.da-tree-checkbox-checked::after {
+          color: var(--theme-color,#007aff);
+          content: '\ead4';
+        }
+
+        &.da-tree-checkbox-indeterminate::after {
+          color: var(--theme-color,#007aff);
+          content: '\ebce';
+        }
+
+        &.da-tree-radio-outline::after {
+          color: #bbb;
+          content: '\ecc5';
+        }
+
+        &.da-tree-radio-checked::after {
+          color: var(--theme-color,#007aff);
+          content: '\ecc4';
+        }
+
+        &.da-tree-radio-indeterminate::after {
+          color: var(--theme-color,#007aff);
+          content: '\ea4f';
+        }
+      }
+
+      &.is--disabled {
+        cursor: not-allowed;
+        opacity: 0.35;
+      }
+    }
+
+    &__label {
+      flex: 1;
+      margin-left: 4rpx;
+      color: #555;
+
+      &--2 {
+        color: var(--theme-color,#007aff);
+      }
+
+      &--append {
+        font-size: 60%;
+        opacity: 0.6;
+      }
+    }
+  }
+}
+
+@keyframes IconLoading {
+  0% {
+    transform: rotate(0deg);
+  }
+
+  100% {
+    transform: rotate(360deg);
+  }
+}
+</style>
diff --git a/components/da-tree-vue2/props.js b/components/da-tree-vue2/props.js
new file mode 100644
index 0000000..44c45a0
--- /dev/null
+++ b/components/da-tree-vue2/props.js
@@ -0,0 +1,183 @@
+// @ts-nocheck
+export default {
+  /**
+   * 树的数据
+   */
+  data: {
+    type: Array,
+    default: () => [],
+  },
+  /**
+   * 主题色
+   */
+  themeColor: {
+    type: String,
+    default: '#007aff',
+  },
+  /**
+   * 是否开启多选，默认单选
+   */
+  showCheckbox: {
+    type: Boolean,
+    default: false,
+  },
+  /**
+   * 默认选中的节点，注意单选时为单个key，多选时为key的数组
+   */
+  defaultCheckedKeys: {
+    type: [Array, String, Number],
+    default: null,
+  },
+  /**
+   * 选择框的位置，可选 left/right
+   */
+  checkboxPlacement: {
+    type: String,
+    default: 'left',
+  },
+  /**
+   * 是否默认展开全部
+   */
+  defaultExpandAll: {
+    type: Boolean,
+    default: false,
+  },
+  /**
+   * 默认展开的节点
+   */
+  defaultExpandedKeys: {
+    type: Array,
+    default: null,
+  },
+  /**
+   * 是否自动展开到选中的节点，默认不展开
+   */
+  expandChecked: {
+    type: Boolean,
+    default: false,
+  },
+  /**
+   * 子项缩进距离，默认40，单位rpx
+   */
+  indent: {
+    type: Number,
+    default: 40,
+  },
+  /**
+   * (旧)字段对应内容，默认为 {label: 'label',key: 'key', children: 'children', disabled: 'disabled', append: 'append'}
+   * 注意：1.5.0版本后不再兼容
+   */
+  field: {
+    type: Object,
+    default: null,
+  },
+  /**
+   * 标签字段(新，拆分了)
+   */
+  labelField: {
+    type: String,
+    default: 'label',
+  },
+  /**
+   * 值字段(新，拆分了)
+   */
+  valueField: {
+    type: String,
+    default: 'value',
+  },
+  /**
+   * 下级字段(新，拆分了)
+   */
+  childrenField: {
+    type: String,
+    default: 'children',
+  },
+  /**
+   * 禁用字段(新，拆分了)
+   */
+  disabledField: {
+    type: String,
+    default: 'disabled',
+  },
+  /**
+   * 末级节点字段(新，拆分了)
+   */
+  leafField: {
+    type: String,
+    default: 'leaf',
+  },
+  /**
+   * 副标签字段(新，拆分了)
+   */
+  appendField: {
+    type: String,
+    default: 'append',
+  },
+  /**
+   * 排序字段(新，拆分了)
+   */
+  sortField: {
+    type: String,
+    default: 'sort',
+  },
+  isLeafFn: {
+    type: Function,
+    default: null,
+  },
+  /**
+   * 是否显示单选图标，默认显示
+   */
+  showRadioIcon: {
+    type: Boolean,
+    default: true,
+  },
+  /**
+   * 单选时只允许选中末级，默认可随意选中
+   */
+  onlyRadioLeaf: {
+    type: Boolean,
+    default: false,
+  },
+  /**
+   * 多选时，是否执行父子不关联的任意勾选，默认父子关联
+   */
+  checkStrictly: {
+    type: Boolean,
+    default: false,
+  },
+  /**
+   * 为 true 时，空的 children 数组会显示展开图标
+   */
+  loadMode: {
+    type: Boolean,
+    default: false,
+  },
+  /**
+   * 异步加载接口
+   */
+  loadApi: {
+    type: Function,
+    default: null,
+  },
+  /**
+   * 是否总在首次的时候加载一下内容，来比对是否一致
+   */
+  alwaysFirstLoad: {
+    type: Boolean,
+    default: false,
+  },
+  /**
+   * 是否渲染(操作)禁用值
+   */
+  checkedDisabled: {
+    type: Boolean,
+    default: false,
+  },
+  /**
+   * 是否返回已禁用的但已选中的key
+   */
+  packDisabledkey: {
+    type: Boolean,
+    default: true,
+  },
+}
diff --git a/components/da-tree-vue2/readme.md b/components/da-tree-vue2/readme.md
new file mode 100644
index 0000000..d4c4459
--- /dev/null
+++ b/components/da-tree-vue2/readme.md
@@ -0,0 +1,303 @@
+# da-tree-vue2
+
+一个基于 Vue2 的 tree(树)组件，同时支持主题换色，可能是最适合你的 tree(树)组件
+
+`内容同步于 Vue3 版本，在此查看 ===>` **[Vue3 版](https://ext.dcloud.net.cn/plugin?id=12384)**
+
+_与 Vue3 版本版本不同的是，此版本兼容更全面，比如 360 小程序、快应用等均支持_
+
+### 关于使用
+
+可在右侧的`使用 HBuilderX 导入插件`或`下载示例项目ZIP`，方便快速上手。
+
+可通过下方的示例及文档说明，进一步了解使用组件相关细节参数。
+
+插件地址：https://ext.dcloud.net.cn/plugin?id=12692
+
+### 组件示例
+
+```jsx
+<template>
+  <view>
+    <view>多选</view>
+    <view><button @click="doCheckedTree(['2'],true)">全选</button></view>
+    <view><button @click="doCheckedTree(['2'],false)">取消全选</button></view>
+    <view><button @click="doCheckedTree(['211','222'],true)">选中指定节点</button></view>
+    <view><button @click="doCheckedTree(['211','222'],false)">取消选中指定节点</button></view>
+    <view><button @click="doExpandTree('all',true)">展开全部节点</button></view>
+    <view><button @click="doExpandTree('all',false)">收起全部节点</button></view>
+    <view><button @click="doExpandTree(['22','23'],true)">展开节点</button></view>
+    <view><button @click="doExpandTree(['22','23'],false)">收起节点</button></view>
+    <DaTreeVue2
+      ref="DaTreeRef"
+      :data="roomTreeData"
+      labelField="name"
+      valueField="id"
+      defaultExpandAll
+      showCheckbox
+      :defaultCheckedKeys="defaultCheckedKeysValue"
+      @change="handleTreeChange"
+      @expand="handleExpandChange" />
+
+    <view>单选</view>
+    <DaTreeVue2
+      :data="roomTreeData"
+      labelField="name"
+      valueField="id"
+      defaultExpandAll
+      :defaultCheckedKeys="defaultCheckedKeysValue2"
+      @change="handleTreeChange"
+      @expand="handleExpandChange" />
+    <view>默认展开指定节点</view>
+    <DaTreeVue2
+      :data="roomTreeData"
+      labelField="name"
+      valueField="id"
+      showCheckbox
+      :defaultExpandedKeys="defaultExpandKeysValue3"
+      @change="handleTreeChange"
+      @expand="handleExpandChange" />
+    <view>异步加载数据</view>
+    <DaTreeVue2
+      :data="roomTreeData"
+      labelField="name"
+      valueField="id"
+      showCheckbox
+      loadMode
+      :loadApi="GetApiData"
+      defaultExpandAll
+      @change="handleTreeChange"
+      @expand="handleExpandChange" />
+  </view>
+</template>
+```
+
+```js
+/**
+ * 模拟创建一个接口数据
+ */
+function GetApiData(currentNode) {
+  const { key } = currentNode
+
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      // 模拟返回空数据
+      if (key.indexOf('-') > -1) {
+        return resolve(null)
+        // return resolve([])
+      }
+
+      return resolve([
+        {
+          id: `${key}-1`,
+          name: `行政部X${key}-1`,
+        },
+        {
+          id: `${key}-2`,
+          name: `财务部X${key}-2`,
+          append: '定义了末项数据',
+          leaf: true,
+        },
+        {
+          id: `${key}-3`,
+          name: `资源部X${key}-3`,
+        },
+        {
+          id: `${key}-4`,
+          name: `资源部X${key}-3`,
+          append: '被禁用，无展开图标',
+          disabled: true,
+        },
+      ])
+    }, 2000)
+  })
+}
+
+import DaTreeVue2 from '@/components/da-tree-vue2/index.vue'
+export default {
+  components: { DaTreeVue2 },
+  data() {
+    return {
+      GetApiData,
+      // key的类型必须对应树数据key的类型
+      defaultCheckedKeysValue: ['211', '222'],
+      defaultCheckedKeysValue2: '222',
+      defaultExpandKeysValue3: ['212', '231'],
+      roomTreeData: [
+        {
+          id: '2',
+          name: '行政中心',
+          children: [
+            {
+              id: '21',
+              name: '行政部',
+              children: [
+                {
+                  id: '211',
+                  name: '行政一部',
+                  children: null,
+                },
+                {
+                  id: '212',
+                  name: '行政二部',
+                  children: [],
+                  disabled: true,
+                },
+              ],
+            },
+            {
+              id: '22',
+              name: '财务部',
+              children: [
+                {
+                  id: '221',
+                  name: '财务一部',
+                  children: [],
+                  disabled: true,
+                },
+                {
+                  id: '222',
+                  name: '财务二部',
+                  children: [],
+                },
+              ],
+            },
+            {
+              id: '23',
+              name: '人力资源部',
+              children: [
+                {
+                  id: '231',
+                  name: '人力一部',
+                  children: [],
+                },
+                {
+                  id: '232',
+                  name: '人力二部',
+                  append: '更多示例，请下载示例项目查看',
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    }
+  },
+  methods: {
+    doExpandTree(keys, expand) {
+      this.$refs.DaTreeRef?.setExpandedKeys(keys, expand)
+
+      const gek = this.$refs.DaTreeRef?.getExpandedKeys()
+      console.log('当前已展开的KEY ==>', gek)
+    },
+    doCheckedTree(keys, checked) {
+      this.$refs.DaTreeRef?.setCheckedKeys(keys, checked)
+
+      const gek = this.$refs.DaTreeRef?.getCheckedKeys()
+      console.log('当前已选中的KEY ==>', gek)
+    },
+    handleTreeChange(allSelectedKeys, currentItem) {
+      console.log('handleTreeChange ==>', allSelectedKeys, currentItem)
+    },
+    handleExpandChange(expand, currentItem) {
+      console.log('handleExpandChange ==>', expand, currentItem)
+    },
+  },
+}
+```
+
+** 更多示例请下载/导入示例项目 ZIP 查看 **
+
+### 组件参数
+
+| 属性                | 类型                            | 默认值     | 必填 | 说明                                                                         |
+| :------------------ | :------------------------------ | :--------- | :--- | :--------------------------------------------------------------------------- |
+| data                | `Array`                         | -          | 是   | 树的数据                                                                     |
+| themeColor          | `String`                        | `#007aff`  | 否   | 主题色，十六进制                                                             |
+| defaultCheckedKeys  | `Array` \| `Number` \| `String` | -          | 否   | 默认选中的节点，单选为单个 key，多选为 key 的数组                            |
+| showCheckbox        | `Boolean`                       | `false`    | 否   | 是否开启多选，默认单选                                                       |
+| checkStrictly       | `Boolean`                       | `false`    | 否   | 多选时，是否执行父子不关联的任意勾选，默认父子关联                           |
+| showRadioIcon       | `Boolean`                       | `true`     | 否   | 是否显示单选图标，默认显示                                                   |
+| onlyRadioLeaf       | `Boolean`                       | `true`     | 否   | 单选时只允许选中末级，默认可随意选中                                         |
+| defaultExpandAll    | `Boolean`                       | `false`    | 否   | 是否默认展开全部                                                             |
+| defaultExpandedKeys | `Array`                         | -          | 否   | 默认展开的节点                                                               |
+| indent              | `Number`                        | `40`       | 否   | 子项缩进距离，单位 rpx                                                       |
+| checkboxPlacement   | `String`                        | `left`     | 否   | 选择框的位置，可选 left/right                                                |
+| loadMode            | `Boolean`                       | `false`    | 否   | 为 true 时，空的 children 数组会显示展开图标                                 |
+| loadApi             | `Function`                      | -          | 否   | 选择框的位置，可选 left/right                                                |
+| checkedDisabled     | `Boolean`                       | `false`    | 否   | 是否渲染禁用值，默认不渲染                                                   |
+| packDisabledkey     | `Boolean`                       | `true`     | 否   | 是否返回已禁用的但已选中的 key，默认返回禁用已选值                           |
+| expandChecked       | `Boolean`                       | `false`    | 否   | 是否自动展开到选中的节点，默认不展开                                         |
+| alwaysFirstLoad     | `Boolean`                       | `false`    | 否   | 是否总在首次的时候加载一下内容，默认不加载，否则只有展开末级节点才会加载数据 |
+| isLeafFn            | `Function`                      | -          | 否   | 自定义函数返回来控制数据项的末项                                             |
+| field               | `Object`                        | -          | 否   | 字段对应内容，格式参考下方(1.5.0 后移除，请用单独的字段匹配)                 |
+| labelField          | `String`                        | `label`    | 否   | 指定节点对象中某个属性为标签字段，默认`label`                                |
+| valueField          | `String`                        | `value`    | 否   | 指定节点对象中某个属性为值字段，默认`value`                                  |
+| childrenField       | `String`                        | `children` | 否   | 指定节点对象中某个属性为子树节点字段，默认`children`                         |
+| disabledField       | `String`                        | `disabled` | 否   | 指定节点对象中某个属性为禁用字段，默认`disabled`                             |
+| appendField         | `String`                        | `append`   | 否   | 指定节点对象中某个属性为副标签字段，默认`append`                             |
+| leafField           | `String`                        | `leaf`     | 否   | 指定节点对象中某个属性为末级节点字段，默认`leaf`                             |
+| sortField           | `String`                        | `sort`     | 否   | 指定节点对象中某个属性为排序字段，默认`sort`                                 |
+
+**field 格式(1.5.0 后移除，请用单独的字段匹配)**
+
+```js
+{
+  label: 'label',
+  key: 'key',
+  children: 'children',
+  disabled: 'disabled',
+  append: 'append'
+}
+```
+
+### 组件事件
+
+| 事件名称 | 回调参数                                | 说明            |
+| :------- | :-------------------------------------- | :-------------- |
+| change   | `(allCheckedKeys, currentItem) => void` | 选中时回调      |
+| expand   | `(expandState, currentItem) => void`    | 展开/收起时回调 |
+
+### 组件方法
+
+| 方法名称            | 参数             | 说明                                                                                              |
+| :------------------ | :--------------- | :------------------------------------------------------------------------------------------------ |
+| setCheckedKeys      | `(keys,checked)` | 设置指定 key 的节点选中/取消选中的状态。注: keys 单选时为 key，多选时为 key 的数组                |
+| setExpandedKeys     | `(keys,expand)`  | 设置指定 key 的节点展开/收起的状态，当 keys 为 all 时即代表展开/收起全部。注：keys 为数组或 `all` |
+| getCheckedKeys      | -                | 返回已选的 key                                                                                    |
+| getHalfCheckedKeys  | -                | 返回半选的 key                                                                                    |
+| getUncheckedKeys    | -                | 返回未选的 key                                                                                    |
+| getCheckedNodes     | -                | 返回已选的节点                                                                                    |
+| getUncheckedNodes   | -                | 返回未选的节点                                                                                    |
+| getHalfCheckedNodes | -                | 返回半选的节点                                                                                    |
+| getExpandedKeys     | -                | 返回已展开的 key                                                                                  |
+| getUnexpandedKeys   | -                | 返回未展开的 key                                                                                  |
+| getExpandedNodes    | -                | 返回已展开的节点                                                                                  |
+| getUnexpandedNodes  | -                | 返回未展开的节点                                                                                  |
+
+### 组件版本
+
+v1.4.1
+
+### 差异化
+
+已通过测试
+
+> - H5 页面
+> - 微信小程序
+> - 支付宝、钉钉小程序
+> - 字节跳动、抖音、今日头条小程序
+> - 百度小程序
+> - 飞书小程序
+> - QQ 小程序
+> - 京东小程序
+> - 快应用
+> - 360 小程序
+
+未测试
+
+> - 快手小程序由于非企业用户暂无演示
+
+### 开发组
+
+[@CRLANG](https://crlang.com)
diff --git a/components/da-tree-vue2/utils.js b/components/da-tree-vue2/utils.js
new file mode 100644
index 0000000..979b331
--- /dev/null
+++ b/components/da-tree-vue2/utils.js
@@ -0,0 +1,151 @@
+// @ts-nocheck
+/** 未选 */
+export const unCheckedStatus = 0
+/** 半选 */
+export const halfCheckedStatus = 1
+/** 选中 */
+export const isCheckedStatus = 2
+
+/**
+ * 深拷贝内容
+ * @param originData 拷贝对象
+ * @author crlang(https://crlang.com)
+ */
+export function deepClone(originData) {
+  const type = Object.prototype.toString.call(originData)
+  let data
+  if (type === '[object Array]') {
+    data = []
+    for (let i = 0; i < originData.length; i++) {
+      data.push(deepClone(originData[i]))
+    }
+  } else if (type === '[object Object]') {
+    data = {}
+    for (const prop in originData) {
+      // eslint-disable-next-line no-prototype-builtins
+      if (originData.hasOwnProperty(prop)) { // 非继承属性
+        data[prop] = deepClone(originData[prop])
+      }
+    }
+  } else {
+    data = originData
+  }
+  return data
+}
+
+/**
+ * 获取所有指定的节点
+ * @param type
+ * @param value
+ * @author crlang(https://crlang.com)
+ */
+export function getAllNodes(list, type, value, packDisabledkey = true) {
+  if (!list || list.length === 0) {
+    return []
+  }
+
+  const res = []
+  for (let i = 0; i < list.length; i++) {
+    const item = list[i]
+    if (item[type] === value) {
+      if ((packDisabledkey && item.disabled) || !item.disabled) {
+        res.push(item)
+      }
+    }
+  }
+
+  return res
+}
+
+/**
+ * 获取所有指定的key值
+ * @param type
+ * @param value
+ * @author crlang(https://crlang.com)
+ */
+export function getAllNodeKeys(list, type, value, packDisabledkey = true) {
+  if (!list || list.length === 0) {
+    return null
+  }
+
+  const res = []
+  for (let i = 0; i < list.length; i++) {
+    const item = list[i]
+    if (item[type] === value) {
+      if ((packDisabledkey && item.disabled) || !item.disabled) {
+        res.push(item.key)
+      }
+    }
+  }
+
+  return res.length ? res : null
+}
+
+/**
+ * 错误输出
+ *
+ * @param msg
+ */
+export function logError(msg, ...args) {
+  console.error(`DaTree: ${msg}`, ...args)
+}
+
+const toString = Object.prototype.toString
+
+export function is(val, type) {
+  return toString.call(val) === `[object ${type}]`
+}
+
+/**
+ * 是否对象(Object)
+ * @param val
+
+ */
+export function isObject(val) {
+  return val !== null && is(val, 'Object')
+}
+
+/**
+ * 是否数字(Number)
+ * @param val
+
+ */
+export function isNumber(val) {
+  return is(val, 'Number')
+}
+
+/**
+ * 是否字符串(String)
+ * @param val
+
+ */
+export function isString(val) {
+  return is(val, 'String')
+}
+
+/**
+ * 是否函数方法(Function)
+ * @param val
+
+ */
+export function isFunction(val) {
+  return typeof val === 'function'
+}
+
+/**
+ * 是否布尔(Boolean)
+ * @param val
+
+ */
+export function isBoolean(val) {
+  return is(val, 'Boolean')
+}
+
+/**
+ * 是否数组(Array)
+ * @param val
+
+ */
+export function isArray(val) {
+  return val && Array.isArray(val)
+}
diff --git a/page_components/eletj.vue b/page_components/eletj.vue
index 2301939..a581b39 100644
--- a/page_components/eletj.vue
+++ b/page_components/eletj.vue
@@ -1,94 +1,94 @@
 <template>
-	<view class="page" style="width: 100%;height: 88vh;overflow: scroll;">
+	<view class="page" style="width: 100%;height: 90vh;overflow: scroll;">
 		<u-navbar :title="tittxt" :border-bottom="false" :background="bgc" back-icon-color="#fff" title-color='#fff'
 			:custom-back="btns" title-size='36' height='50' id="navbar">
 		</u-navbar>
-
-		<view class="dltop">
-			<view class="dian_list">
-				<view class="">
-					{{sbobj.voltage == undefined ? '--' : sbobj.voltage}}
+        <!-- 操作 -->
+        <view class="card2" style="height: 130rpx;padding-top: 28rpx;" v-if="detaobj.suitFeeType == 1 || detaobj.suitFeeType == 4">
+            <view class="" style="display: flex;box-sizing: border-box;width: 100%;
+            height: 80rpx;align-items: center;justify-content: space-between;border-radius: 20rpx;font-size: 32rpx;color: #3D3D3D;">
+            	<view class="bot" style="display: flex;align-items: center;"><image style="width: 42rpx;height: 42rpx;margin-right: 10rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uHhpYbtWtakjIWbBdfkU" mode=""></image> 临时开关：{{tdtxt}}</view>
+            	<view class="cont" @click="btnkq">
+            		<view class="top" style="padding-top: 10rpx;">
+            			<view class="rt">
+            				<image v-if="tdtxt == '开启'" style="width: 160rpx;height: 80rpx;"
+            					src="https://api.ccttiot.com/smartmeter/img/static/uccaWar4FDp37op7haWM " mode="aspectFit">
+            				</image>
+            				<image style="width: 160rpx;height: 80rpx;" v-else
+            					src="https://api.ccttiot.com/smartmeter/img/static/ur9HRtZKY7YcxGewJARz" mode="aspectFit">
+            				</image>
+            			</view>
+            		</view>
+            	</view>
+            </view>
+        </view>
+		<view class="" style="background-color: #fff;padding: 30rpx;border-radius: 20rpx;box-sizing: border-box;box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0,0,0,0.08);margin-top: 30rpx;">
+			<view class="dltop">
+				<view class="dian_list">
+					<view class="">
+						{{sbobj.voltage == undefined ? '--' : sbobj.voltage}}
+					</view>
+					<view class="">
+						{{sbobj.electricity == undefined ? '--' : sbobj.electricity}}
+					</view>
+					<view class="">
+						{{sbobj.realTimePower == undefined ? '--' : sbobj.realTimePower}}
+					</view>
 				</view>
-				<view class="">
-					{{sbobj.electricity == undefined ? '--' : sbobj.electricity}}
+				<view class="dian_list">
+					<view class="">
+						电压（V）
+					</view>
+					<view class="">
+						电流（A）
+					</view>
+					<view class="">
+						功率（W）
+					</view>
+				</view>
+				<view class="botwz">
+					<!-- 点击刷新实时信息 -->
+				<view @click="shuaxin(1)" style="width: 100%;display: flex;color: #fff;justify-content: center;align-items: center;padding-top:40rpx;padding-bottom: 30rpx;box-sizing: border-box;">
+					点击刷新实时信息 
 				</view>
-				<view class="">
-					{{sbobj.realTimePower == undefined ? '--' : sbobj.realTimePower}}
 				</view>
 			</view>
-			<view class="dian_list">
-				<view class="">
-					电压（V）
+			<view class="wz" v-if="onlineStatus == 0">
+				<view v-if="ver_dataflag == 1" style="color: #8883F0;">
+					<image src="https://api.ccttiot.com/smartmeter/img/static/u6akzRBuxxP94XlUcMtV" mode=""></image>
+					未连接
 				</view>
-				<view class="">
-					电流（A）
+				<view v-if="ver_dataflag == 2" style="color: #8883F0;">
+					<image src="https://api.ccttiot.com/smartmeter/img/static/u6akzRBuxxP94XlUcMtV" mode=""></image>
+					连接中
 				</view>
-				<view class="">
-					功率（W）
+				<view v-if="ver_dataflag == 3" style="color: #8883F0;">
+					<image src="https://api.ccttiot.com/smartmeter/img/static/usSHAkmok1YIdjsgRECI" mode=""></image>
+					已连接
 				</view>
 			</view>
-			<view class="botwz">
-				<!-- 点击刷新实时信息 -->
-			<view @click="shuaxin(1)" style="width: 100%;display: flex;color: #fff;justify-content: center;align-items: center;padding-top:40rpx;padding-bottom: 30rpx;box-sizing: border-box;">
-				点击刷新实时信息 
-			</view>
-			</view>
-		</view>
-		<view class="wz" v-if="onlineStatus == 0">
-			<view v-if="ver_dataflag == 1" style="color: #8883F0;">
-				<image src="https://api.ccttiot.com/smartmeter/img/static/u6akzRBuxxP94XlUcMtV" mode=""></image>
-				未连接
-			</view>
-			<view v-if="ver_dataflag == 2" style="color: #8883F0;">
-				<image src="https://api.ccttiot.com/smartmeter/img/static/u6akzRBuxxP94XlUcMtV" mode=""></image>
-				连接中
-			</view>
-			<view v-if="ver_dataflag == 3" style="color: #8883F0;">
-				<image src="https://api.ccttiot.com/smartmeter/img/static/usSHAkmok1YIdjsgRECI" mode=""></image>
-				已连接
-			</view>
-		</view>
-		<!-- 操作 -->
-		<view class="card2" style="padding-bottom: 30rpx;box-sizing: border-box;margin-top: 0;" v-if="detaobj.suitFeeType == 1 || detaobj.suitFeeType == 4">
-		    <view class="" style="display: flex;box-sizing: border-box;width: 100%;
-		    height: 80rpx;align-items: center;justify-content: space-between;border-radius: 20rpx;font-size: 32rpx;color: #3D3D3D;">
-		    	<view class="bot">临时开关：{{tdtxt}}</view>
-		    	<view class="cont" @click="btnkq">
-		    		<view class="top" style="padding-top: 10rpx;">
-		    			<view class="rt">
-		    				<image v-if="tdtxt == '开启'" style="width: 160rpx;height: 80rpx;"
-		    					src="https://api.ccttiot.com/smartmeter/img/static/uccaWar4FDp37op7haWM " mode="aspectFit">
-		    				</image>
-		    				<image style="width: 160rpx;height: 80rpx;" v-else
-		    					src="https://api.ccttiot.com/smartmeter/img/static/ur9HRtZKY7YcxGewJARz" mode="aspectFit">
-		    				</image>
-		    			</view>
-		    		</view>
-		    	</view>
-		    </view>
-		</view>
-
-		<view class="time_list">
-			<view class="time_top">
-				<view class="">
-					<text v-if="detaobj.suitFeeType == 2 || detaobj.suitFeeType == 3">{{du}}度</text>
-					<text v-if="detaobj.suitFeeType == 1 || detaobj.suitFeeType == 4">{{formattedTime == '1秒' ? '0' : formattedTime}}</text>
+			<view class="time_list">
+				<view class="time_top">
+					<view class="">
+						<text v-if="detaobj.suitFeeType == 2 || detaobj.suitFeeType == 3">{{du}}度</text>
+						<text v-if="detaobj.suitFeeType == 1 || detaobj.suitFeeType == 4">{{formattedTime == '1秒' ? '0' : formattedTime}}</text>
+					</view>
+					<view class="" v-if="detaobj.suitEndTime">
+						￥{{detaobj.money}}
+					</view>
+					<view class="" v-else>
+						<text v-if="detaobj.suitFeeType == 3 || detaobj.suitFeeType == 4">￥{{feeprice}}</text> <text
+							v-else>￥{{detaobj.suitPrice == null ? '--' : detaobj.suitPrice}}</text>
+					</view>
 				</view>
-				<view class="" v-if="detaobj.suitEndTime">
-					￥{{detaobj.money}}
-				</view>
-				<view class="" v-else>
-					<text v-if="detaobj.suitFeeType == 3 || detaobj.suitFeeType == 4">￥{{feeprice}}</text> <text
-						v-else>￥{{detaobj.suitPrice == null ? '--' : detaobj.suitPrice}}</text>
-				</view>
-			</view>
-			<view class="time_bot" v-if="!detaobj.suitEndTime || detaobj.suitFeeType == 1">
-				<view class="">
-					<text >订单剩余</text>
-				</view>
-				<view class="">
-					<text v-if="detaobj.suitFeeType == 3 || detaobj.suitFeeType == 4">预估金额,以实际金额为准</text>
-					<text v-else>金额</text>
+				<view class="time_bot" v-if="!detaobj.suitEndTime || detaobj.suitFeeType == 1">
+					<view class="">
+						<text >订单剩余</text>
+					</view>
+					<view class="">
+						<text v-if="detaobj.suitFeeType == 3 || detaobj.suitFeeType == 4">预估金额,以实际金额为准</text>
+						<text v-else>金额</text>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -96,117 +96,135 @@
 			<view class="top_price">
 				价格明细
 			</view>
-			<view class="qian">
-				<view class="yajin">
-					<text v-if="detaobj.suitFeeMode == 2">押金</text>
-					<text v-else>
-						<text v-if="detaobj.suitFeeType == 1">{{detaobj.suitTime == null ? '--' : detaobj.suitTime}}<text
-								v-if="detaobj.suitTimeUnit == 2">时</text> <text v-if="detaobj.suitTimeUnit == 3">分钟</text>
-							<text v-if="detaobj.suitTimeUnit == 4">秒</text></text>
-						<text v-if="detaobj.suitFeeType == 2">{{detaobj.suitTime}}度</text>
-					</text>
-					
-				</view>
-				<view class="yuan" v-if="detaobj.suitFeeMode == 2">
-					{{detaobj.suitDeposit == null ? '--' : detaobj.suitDeposit}}元
-				</view>
-				<view class="yuan" v-else>
-					{{detaobj.suitPrice == null ? '--' : detaobj.suitPrice}}元
-				</view>
-			</view>
-			<view class="jisuan">
-				计价方式：<text v-if="detaobj.suitFeeType == 1">计时收费</text>
-				<text v-if="detaobj.suitFeeType == 2">按量收费</text>
-				<text v-if="detaobj.suitFeeType == 3">分时段按量收费</text>
-				<text v-if="detaobj.suitFeeType == 4">分时段按时收费</text>
-			</view>
-			<view class="list_box" style="width: 100%" v-if="detaobj.suitFeeType == 3 || detaobj.suitFeeType == 4">
-				<view class="ulbox">
-					<view class="ulli">
-						<view class="li" v-for="(val,gearAmountindex) in newArr" :key="gearAmountindex">
-							{{val}}元
+			<!-- <u-collapse>
+				<u-collapse-item title="价格明细"> -->
+					<view class="qian">
+						<view class="yajin">
+							<text v-if="detaobj.suitFeeMode == 2">押金</text>
+							<text v-else>
+								<text v-if="detaobj.suitFeeType == 1">{{detaobj.suitTime == null ? '--' : detaobj.suitTime}}<text
+										v-if="detaobj.suitTimeUnit == 2">时</text> <text v-if="detaobj.suitTimeUnit == 3">分钟</text>
+									<text v-if="detaobj.suitTimeUnit == 4">秒</text></text>
+								<text v-if="detaobj.suitFeeType == 2">{{detaobj.suitTime}}度</text>
+							</text>
+						</view>
+						<view class="yuan" v-if="detaobj.suitFeeMode == 2">
+							{{detaobj.suitDeposit == null ? '--' : detaobj.suitDeposit}}元
+						</view>
+						<view class="yuan" v-else>
+							{{detaobj.suitPrice == null ? '--' : detaobj.suitPrice}}元
 						</view>
 					</view>
-					<view class="olli">
-						<view class="li" v-for="(vals,timeindex) in 24" :key="timeindex">
-							{{timeindex + ':00'}}
+					<view class="jisuan">
+						计价方式：<text v-if="detaobj.suitFeeType == 1">计时收费</text>
+						<text v-if="detaobj.suitFeeType == 2">按量收费</text>
+						<text v-if="detaobj.suitFeeType == 3">分时段按量收费</text>
+						<text v-if="detaobj.suitFeeType == 4">分时段按时收费</text>
+					</view>
+					<view class="list_box" style="width: 100%" v-if="detaobj.suitFeeType == 3 || detaobj.suitFeeType == 4">
+						<view class="ulbox">
+							<view class="ulli">
+								<view class="li" v-for="(val,gearAmountindex) in newArr" :key="gearAmountindex">
+									{{val}}元
+								</view>
+							</view>
+							<view class="olli">
+								<view class="li" v-for="(vals,timeindex) in 24" :key="timeindex">
+									{{timeindex + ':00'}}
+								</view>
+							</view>
+						</view>
+						<view class="" style="margin-top: 16rpx;margin-bottom: 10rpx;width: 100%;text-align: center;color: #666;font-size: 24rpx;">
+							左滑查看全部时段收费价格
 						</view>
 					</view>
-				</view>
-			</view>
+				<!-- </u-collapse-item>
+			</u-collapse> -->
 		</view>
-
 		<view class="zujie">
-			<view class="toptit">
-				订单信息
-			</view>
-			<view class="emilist">
-				<view class="">
-					开始时间
-				</view>
-				<view class="">
-					{{detaobj.suitStartTime == null ? '--' : detaobj.suitStartTime}}
-				</view>
-			</view>
-			<view class="emilist">
-				<view class="">
-					店铺名称
-				</view>
-				<view class="">
-					{{detaobj.storeName == null ? '--' : detaobj.storeName}}
-				</view>
-			</view>
-			<view class="emilist">
-				<view class="">
-					详细地址
-				</view>
-				<view class="">
-					{{detaobj.storeAddress == null ? '--' : detaobj.storeAddress}}
-				</view>
-			</view>
-			<view class="emilist">
-				<view class="">
-					套餐名称
-				</view>
-				<view class="">
-					{{detaobj.suitName == null ? '--' : detaobj.suitName}}
-				</view>
-			</view>
-			<view class="emilist">
-				<view class="">
-					设备编号
-				</view>
-				<view class="">
-					{{detaobj.deviceNo == null ?'--' : detaobj.deviceNo}}
-				</view>
-			</view>
-			<view class="emilist">
-				<view class="">
-					订单编号
-				</view>
-				<view class="">
-					{{detaobj.billNo == null ? '--' : detaobj.billNo}}
-				</view>
-			</view>
+			<u-collapse>
+				<u-collapse-item title="订单信息">
+					<view class="emilist">
+						<view class="">
+							开始时间
+						</view>
+						<view class="">
+							{{detaobj.suitStartTime == null ? '--' : detaobj.suitStartTime}}
+						</view>
+					</view>
+					<view class="emilist">
+						<view class="">
+							店铺名称
+						</view>
+						<view class="">
+							{{detaobj.storeName == null ? '--' : detaobj.storeName}}
+						</view>
+					</view>
+					<view class="emilist">
+						<view class="">
+							详细地址
+						</view>
+						<view class="">
+							{{detaobj.storeAddress == null ? '--' : detaobj.storeAddress}}
+						</view>
+					</view>
+					<view class="emilist">
+						<view class="">
+							套餐名称
+						</view>
+						<view class="">
+							{{detaobj.suitName == null ? '--' : detaobj.suitName}}
+						</view>
+					</view>
+					<view class="emilist">
+						<view class="">
+							设备编号
+						</view>
+						<view class="">
+							{{detaobj.deviceNo == null ? '--' : detaobj.deviceNo}}
+						</view>
+					</view>
+					<view class="emilist">
+						<view class="">
+							订单编号
+						</view>
+						<view class="">
+							{{detaobj.billNo == null ? '--' : detaobj.billNo}}
+						</view>
+					</view>
+				</u-collapse-item>
+			</u-collapse>
 		</view>
 		
-		<!-- 电话客服 -->
-		<image class="imgtel" @click="btncall" src="https://api.ccttiot.com/smartmeter/img/static/uJtDyokYXyBVzIs6hXHv" mode="aspectFit"></image>
-		
+		<view class="zujie" v-if="detaobj.suitFeeType == 3">
+			<u-collapse>
+				<u-collapse-item title="电量记录">
+					<view class="emilist" v-for="(item,index) in yongdianlist" :key="index">
+						<view class="">
+							{{item.timeStart}}-{{item.timeEnd}}
+						</view> 
+						<view class="">
+							{{item.usedEle}}度
+						</view>
+					</view>
+					<view class="" style="width: 100%;text-align: center;margin-top: 10rpx;color: #ccc;">
+						暂时没有更多记录了
+					</view>
+				</u-collapse-item>
+			</u-collapse>
+		</view>
 		
 		<view class="">
 			<view class="jieshu" v-if="jieshuflag">
 				<text style="justify-content: center;" v-if="detaobj.status == 1">立即支付</text>
 				<text style="justify-content: center" v-else>结束订单</text>
 			</view>
-			<view class="jieshu" v-else>
-				<text style="border-right: 1px solid;" @click="btnxudan">续单</text>
+			<view class="jieshu" v-else @click="btnjieshu">
 				<!-- <text style="justify-content: center;" v-if="detaobj.status == 1" @click="btnljzf">立即支付</text> -->
-				<text style="justify-content: center;width: 350rpx;" @click="btnjieshu">结束订单</text>
+				<text style="justify-content: center;width: 350rpx;">结束订单</text>
 			</view>
 		</view>
 		<view class="mask" v-if="jieshufalg"></view>
-
 		<!-- 点击结束弹窗 -->
 		<view class="truebox" v-if="trueboxfalg">
 			<view class="titvalue">
@@ -226,26 +244,10 @@
 			</view>
 		</view>
 		<view class="mask" v-if="trueboxfalg"></view>
-		
-		
-		<!-- <view class="tip_box" v-if="czflag">
-			<view class="top">
-				<view class="txt">
-					系统检测该设备未联网或者为蓝牙版本,金额充值失败,请靠近设备进行蓝牙充值
-				</view>
-			</view>
-			<view class="bot">
-				<view class="bot_left" @click="czflag = false">
-					取消
-				</view>
-				<view class="bot_right" @click="tocz()">
-					蓝牙充值
-				</view>
-			</view>
+		<view class="xuanfu">
+			<image  @click="btnxudan" src="https://api.ccttiot.com/smartmeter/img/static/uoWjvyL09yb5K2BBVXPI" mode=""></image>
+			<image @click="btncall" src="https://api.ccttiot.com/smartmeter/img/static/u8TAJX3G33gR7SPKtauw" mode=""></image>
 		</view>
-		<view class="masks" v-if="czflag"></view> -->
-
-
 	</view>
 </template>
 
@@ -253,7 +255,7 @@
 	var xBlufi = require("@/page_components/blufi/xBlufi.js")
 	import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas.vue'
 	import * as echarts from '@/components/uni-ec-canvas/echarts'
-import { Counter } from './blufi/crypto/aes'
+    import { Counter } from './blufi/crypto/aes'
 	let chart = null
 	export default {
 		components: {
@@ -327,6 +329,7 @@ import { Counter } from './blufi/crypto/aes'
 				devicesarr:[],
 				timedingshi: null, // 定时器
 				countdown: 30, // 倒计时时间
+				yongdianlist:[]
 			}
 		},
 		onLoad(option) {
@@ -350,13 +353,12 @@ import { Counter } from './blufi/crypto/aes'
 			setTimeout(()=>{
 				this.startTimerone()
 			},1500)
-			
 		},
 		computed: {
 			
 		},
 		onUnload: function() {
-			console.log("unload ");
+			console.log("unload");
 			this.stopTimer();
 			this.clearTimer()
 			clearInterval(this.timerone);  
@@ -367,7 +369,6 @@ import { Counter } from './blufi/crypto/aes'
 			   deviceId: this.deviceId,
 			   name: this.name
 			})
-
 		},
 		 mounted() {  
 		    // 组件挂载后启动定时器  
@@ -419,29 +420,28 @@ import { Counter } from './blufi/crypto/aes'
 			}
 		},
 		onHide() {
-		    console.log("页面隐藏");
-		    this.handleScreenOff();
+		    console.log("页面隐藏")
+		    this.handleScreenOff()
 			uni.navigateBack()
 		  },
 		methods: {
 			// 处理息屏事件
-			    handleScreenOff() {
-			      console.log("处理息屏事件");
-				  xBlufi.notifyConnectBle({
-				     isStart: false,
-				     deviceId: this.deviceId,
-				     name: this.name
-				  })
-				  this.clearTimer() // 倒计时结束，清除定时器
-				  uni.reLaunch({
-				  	url:'/pages/shouye/index'
-				  })
-			    },
-			    // 处理亮屏事件
-			    handleScreenOn() {
-			      console.log("处理亮屏事件");
-			    },
-			
+			handleScreenOff() {
+			  console.log("处理息屏事件");
+			  xBlufi.notifyConnectBle({
+			     isStart: false,
+			     deviceId: this.deviceId,
+			     name: this.name
+			  })
+			  this.clearTimer() // 倒计时结束，清除定时器
+			  uni.reLaunch({
+			  	url:'/pages/shouye/index'
+			  })
+			},
+			// 处理亮屏事件
+			handleScreenOn() {
+			  console.log("处理亮屏事件");
+			},
 			// 启动定时器
 			 startTimerdingshi() {
 				 let that = this
@@ -535,7 +535,6 @@ import { Counter } from './blufi/crypto/aes'
 			      return `${timeObj.seconds}秒`;  
 			    }  
 			  },  
-			
 			startTimerone() {  
 			      // 清除之前可能存在的定时器，防止重复设置  
 			      clearInterval(this.timerone);  
@@ -566,7 +565,6 @@ import { Counter } from './blufi/crypto/aes'
 					url: '/page_fenbao/chongzhi?dingobj=' + JSON.stringify(this.dingobj)
 				})
 			},
-			
 			// 点击拨打客服电话
 			btncall(){
 				let phoneNumber = ''
@@ -585,8 +583,6 @@ import { Counter } from './blufi/crypto/aes'
 					}
 				})
 			},
-			
-			
 			// 开启和关闭
 			btnkq() {
 				if (this.onlineStatus == 1) {
@@ -711,10 +707,6 @@ import { Counter } from './blufi/crypto/aes'
 					}
 				}
 			},
-		
-			
-			
-			
 			// 点击进行强刷数据
 			shuaxin(txt){
 				clearInterval(this.timerIds); 
@@ -1001,7 +993,14 @@ import { Counter } from './blufi/crypto/aes'
 					}
 				})
 			},
-            
+			// 获取分时段用电量
+			getyongdian() {
+				this.$u.get(`/app/billEleRecord/listByBill?billId=${this.billId}`).then(res => {
+					if (res.code == 200) {
+						this.yongdianlist = res.data
+					}
+				})
+			},
 			// 获取订单详情
 			getDevice() {
 				this.$u.get(`/app/bill/byNo/${this.id}`).then(res => {
@@ -1012,6 +1011,7 @@ import { Counter } from './blufi/crypto/aes'
 						this.detaobj = res.data
 						this.billId = res.data.billId
 						this.orderno = res.data.billNo
+						this.getyongdian()
 						if(res.data.deviceRechargeStatus == 1){
 							clearInterval(this.timerone);  
 							this.timerone = null
@@ -1086,101 +1086,55 @@ import { Counter } from './blufi/crypto/aes'
 					let that = this
 					if (that.deviceId != '') {
 						let systemInfo = uni.getSystemInfoSync()
-								if (systemInfo.platform == 'android') {
-									that.modelId.some(item => {
-										if(item == 2){
-											console.log('配网');
-											let zuih = ''
-											if(that.deviceId.slice(-1) == 8){
-												zuih = 'A'
-											}else if(that.deviceId.slice(-1) == 9){
-												zuih = 'B'
-											}else if(that.deviceId.slice(-1) == 'A'){
-											    zuih = 'C'
-										    }else if(that.deviceId.slice(-1) == 'B'){
-										    	zuih = 'D'
-										    }else if(that.deviceId.slice(-1) == 'C'){
-										    	zuih = 'E'
-										    }else if(that.deviceId.slice(-1) == 'D'){
-										    	zuih = 'F'
-										    }else{
-												zuih = Number(that.deviceId.slice(-1)) + 2
-											}
-											that.deviceId = that.deviceId.slice(0, -1) + zuih
-											console.log(that.modelId,zuih,that.deviceId.slice(0, -1),'...........')
-											xBlufi.notifyStartDiscoverBle({
-												'isStart': false
-											})
-											console.log("进入蓝牙连接", that.deviceId)
-											console.log("进入that.name", that.name)
-											xBlufi.notifyConnectBle({
-												isStart: true,
-												deviceId: that.deviceId,
-												name: that.name
-											})
-										}else{
-											console.log('无配网');
-											xBlufi.notifyStartDiscoverBle({
-												'isStart': false
-											})
-											console.log("进入蓝牙连接", that.deviceId)
-											console.log("进入that.name", that.name)
-											xBlufi.notifyConnectBle({
-												isStart: true,
-												deviceId: that.deviceId,
-												name: that.name
-											})
-										}
-									})
-								} else if (systemInfo.platform == 'ios') {
-									// 当前设备是 iOS  
-									that.findDevice()
-								// 	var falg = 0
-								// 	console.log("进入这里是IOS")
-								// 	this.devicesarr.forEach(device => {
-								// 		console.log(device.name, this.qrResult, '111')
-								// 		console.log("IOSMAC",device)
-								// 		console.log("device.name",device.name)
-								// 		console.log("that.qrResult",that.qrResult)
-								// 		if (device.name.slice(-12) == that.qrResult.slice(-12)) {
-								// 			this.deviceId = device.deviceId
-								// 			this.name = device.device
-								// 			console.log(this.deviceId, '11221');
-								// 			falg = 1;
-								// 			xBlufi.notifyStartDiscoverBle({
-								// 				'isStart': false
-								// 			})
-								// 			xBlufi.notifyConnectBle({
-								// 			isStart: true,
-								// 			deviceId: device.deviceId,
-								// 			name: device.name
-								// 		})	
-								// 	}
-								// })
-								// if(falg==0){
-								// 		setTimeout(()=>{
-								// 			this.devicesarr.forEach(device => {
-								// 			console.log(device.name, this.qrResult, '111')
-								// 			console.log("IOSMAC",device)
-								// 			console.log("device.name",device.name)
-								// 			console.log("that.qrResult",that.qrResult)
-								// 			if (device.name.slice(-12) == that.qrResult.slice(-12)) {
-								// 				this.deviceId = device.deviceId
-								// 				this.name = device.device
-								// 				console.log(this.deviceId, '11221');
-								// 				falg = 1;
-								// 				xBlufi.notifyStartDiscoverBle({
-								// 					'isStart': false
-								// 				})
-								// 				xBlufi.notifyConnectBle({
-								// 				isStart: true,
-								// 				deviceId: device.deviceId,
-								// 				name: device.name
-								// 			})	
-								// 		  } 
-								// 	  })
-								//    },3000)
-							 //    }
+						    if (systemInfo.platform == 'android') {
+						    	that.modelId.some(item => {
+						    		if(item == 2){
+						    			console.log('配网');
+						    			let zuih = ''
+						    			if(that.deviceId.slice(-1) == 8){
+						    				zuih = 'A'
+						    			}else if(that.deviceId.slice(-1) == 9){
+						    				zuih = 'B'
+						    			}else if(that.deviceId.slice(-1) == 'A'){
+						    			    zuih = 'C'
+						    		    }else if(that.deviceId.slice(-1) == 'B'){
+						    		    	zuih = 'D'
+						    		    }else if(that.deviceId.slice(-1) == 'C'){
+						    		    	zuih = 'E'
+						    		    }else if(that.deviceId.slice(-1) == 'D'){
+						    		    	zuih = 'F'
+						    		    }else{
+						    				zuih = Number(that.deviceId.slice(-1)) + 2
+						    			}
+						    			that.deviceId = that.deviceId.slice(0, -1) + zuih
+						    			console.log(that.modelId,zuih,that.deviceId.slice(0, -1),'...........')
+						    			xBlufi.notifyStartDiscoverBle({
+						    				'isStart': false
+						    			})
+						    			console.log("进入蓝牙连接", that.deviceId)
+						    			console.log("进入that.name", that.name)
+						    			xBlufi.notifyConnectBle({
+						    				isStart: true,
+						    				deviceId: that.deviceId,
+						    				name: that.name
+						    			})
+						    		}else{
+						    			console.log('无配网');
+						    			xBlufi.notifyStartDiscoverBle({
+						    				'isStart': false
+						    			})
+						    			console.log("进入蓝牙连接", that.deviceId)
+						    			console.log("进入that.name", that.name)
+						    			xBlufi.notifyConnectBle({
+						    				isStart: true,
+						    				deviceId: that.deviceId,
+						    				name: that.name
+						    			})
+						    		}
+						    	})
+						    } else if (systemInfo.platform == 'ios') {
+						    	// 当前设备是 iOS  
+						    	that.findDevice()
 						}
 					}
 				}
@@ -1260,7 +1214,6 @@ import { Counter } from './blufi/crypto/aes'
 					seconds: seconds
 				}
 			},
-			
 			funListenDeviceMsgEvent: function(options) {
 				switch (options.type) {
 					case xBlufi.XBLUFI_TYPE.TYPE_STATUS_CONNECTED:
@@ -1271,19 +1224,7 @@ import { Counter } from './blufi/crypto/aes'
 					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS:
 						if (options.result) {
 							this.devicesarr = options.data
-							// console.log(devicesarr, this.mac, '111')
-							// devicesarr.forEach(device => {
-							// 	// const mac = device.name.substring(4)
-							// 	// if (device.name.slice(-12) == this.qrResult) {
-							// 	// 	this.deviceId = device.deviceId
-							// 	// 	this.name = device.name
-							// 	// 	// console.log(device.name,this.mac,'222');
-							// 	// 	this.devicesList.push(device)
-							// 	// 	let uniqueDevicesList = Array.from(new Set(this.devicesList))
-							// 	// 	// 将去重后的数组重新赋值给 this.devicesList
-							// 	// 	this.devicesList = uniqueDevicesList
-							// 	// } 
-							// })
+					
 						}
 						break;
 					case xBlufi.XBLUFI_TYPE.TYPE_CONNECTED:
@@ -1316,14 +1257,6 @@ import { Counter } from './blufi/crypto/aes'
 							this.jieshufalg = false
 							uni.hideLoading()
 						break
-					// case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_STOP:
-					// 	if (options.result) {
-					// 		let uniqueDevicesList = Array.from(new Set(this.devicesList));
-					// 		let filteredDevices = uniqueDevicesList.filter(device => device.name.substring(0, 4) === "CTKG");
-					// 		// 将过滤后的数组重新赋值给 this.devicesList
-					// 		this.devicesList = filteredDevices
-					// 	}
-					// 	break
 					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START:
 						if (!options.result) {
 							this.lanyaflag = true
@@ -1335,7 +1268,6 @@ import { Counter } from './blufi/crypto/aes'
 						break
 				}
 			},
-			
 			parseCustomData(data) {
 				// 将字符串按照 "@" 分割成数组  
 				const dataArray = data.split('@')
@@ -1373,16 +1305,28 @@ import { Counter } from './blufi/crypto/aes'
 		}
 	}
 </script>
-
 <style lang="scss">
+	/deep/ .u-collapse-title{
+		font-weight: 600;
+		font-size: 32rpx;
+	}
 	/deep/ .u-title {
 		padding-bottom: 22rpx;
 	}
-
 	/deep/ .u-icon__icon {
-		padding-bottom: 22rpx;
+		padding-bottom: 12rpx;
+	}
+    .xuanfu{
+		position: fixed;
+		top: 66%;
+		right: 0;
+		image{
+			width: 114rpx;
+			height: 114rpx;
+			margin-top: 40rpx;
+			display: block;
+		}
 	}
-    
 	.imgtel{
 	    position: fixed;
 	    left: 36rpx;
@@ -1391,17 +1335,15 @@ import { Counter } from './blufi/crypto/aes'
 	    height: 90rpx;
 	    z-index: 99;
 	}
-	
 	page {
 		background-color: #F7FAFE;
 		padding: 0 30rpx;
 		box-sizing: border-box;
-		padding-bottom: 300rpx;
-		overflow: scroll;
+		// padding-bottom: 300rpx;
+		// overflow: scroll;
 		-ms-overflow-style: none;
 		/* 去除IE和Edge的默认滚动条 */
 		scrollbar-width: none;
-		
 		/* 去除Firefox的默认滚动条 */
 		&::-webkit-scrollbar {
 			display: none;
@@ -1421,14 +1363,10 @@ import { Counter } from './blufi/crypto/aes'
 			}
 		}
 	}
-	
 	.card2 {
-		padding-top: 40rpx;
-		margin-top: 70rpx;
-		// width: 670rpx;
+		padding-bottom: 30rpx;box-sizing: border-box;margin-top: 0;margin-top: 20rpx;padding: 0 20rpx;box-sizing: border-box;box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0,0,0,0.08);
+		margin-top: 30rpx;
 		max-height: 314rpx;
-		// background: #FFFFFF;
-		// box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(53, 140, 255, 0.1);
 		border-radius: 28rpx;
 	    .aa{
 			padding-left: 40rpx;
@@ -1446,14 +1384,11 @@ import { Counter } from './blufi/crypto/aes'
 			color: #3D3D3D;
 			font-weight: 600;
 		}
-	
 		.cont_box {
 			margin-top: 32rpx;
 			display: flex;
 			flex-wrap: nowrap;
 			justify-content: space-around;
-	
-	
 			.cont {
 				width: 25%;
 				display: flex;
@@ -1461,7 +1396,6 @@ import { Counter } from './blufi/crypto/aes'
 				align-items: center;
 				justify-content: center;
 				text-align: center;
-	
 				.top {
 					width: 100%;
 					font-size: 32rpx;
@@ -1469,7 +1403,6 @@ import { Counter } from './blufi/crypto/aes'
 					font-weight: 400;
 					color: #262B37;
 				}
-	
 				.bot {
 					margin-top: 20rpx;
 					font-size: 26rpx;
@@ -1480,7 +1413,6 @@ import { Counter } from './blufi/crypto/aes'
 			}
 		}
 	}
-
 	.truebox {
 		width: 500rpx;
 		max-height: 380rpx;
@@ -1493,22 +1425,18 @@ import { Counter } from './blufi/crypto/aes'
 		z-index: 99;
 		padding: 30rpx;
 		box-sizing: border-box;
-
 		.titvalue {
 			width: 100%;
 			text-align: center;
 			margin-top: 30rpx;
 			font-size: 32rpx;
 		}
-
 		.truebtn {
 			display: flex;
 			margin-top: 30rpx;
-
 			.quxiao {
 				border-right: 1px solid #ccc;
 			}
-
 			view {
 				width: 50%;
 				text-align: center;
@@ -1518,97 +1446,83 @@ import { Counter } from './blufi/crypto/aes'
 			}
 		}
 	}
-
 	.jieshu {
 		width: 558rpx;
 		height: 90rpx;
-        display: flex;
-		text {
-			width: 200rpx;
-			height: 90rpx;
-			display: block;
-		}
-
 		line-height: 90rpx;
 		background: #8883F0;
 		border-radius: 54rpx 54rpx 54rpx 54rpx;
 		font-size: 36rpx;
 		color: #FFFFFF;
-		// font-weight: 600;
 		text-align: center;
 		position: fixed;
-		bottom: 76rpx;
-		left: 58%;
+		bottom: 50rpx;
+		left: 50%;
 		transform: translateX(-50%);
 	}
-
 	.zujie {
 		margin-top: 32rpx;
-
+        width: 100%;
+        background: #FFFFFF;
+		border-radius: 20rpx;
+		padding: 10rpx 20rpx;
+		box-sizing: border-box;
+        box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0,0,0,0.08);
 		.toptit {
 			font-size: 32rpx;
 			color: #333333;
 			font-weight: 600;
 		}
-
 		.emilist {
 			display: flex;
 			justify-content: space-between;
-			margin-top: 28rpx;
-
+			margin-bottom: 28rpx;
 			view {
 				font-size: 24rpx;
 				color: #808080;
 			}
 		}
 	}
-
 	.price_list {
-		border-bottom: 1px solid #D8D8D8;
-		padding-bottom: 26rpx;
+		padding: 20rpx;
+		margin-top: 30rpx;
 		box-sizing: border-box;
-
+        background-color: #fff;
+		border-radius: 20rpx;
 		.top_price {
 			font-size: 32rpx;
 			color: #333333;
 			font-weight: 600;
-			margin-top: 24rpx;
-			margin-bottom: 28rpx;
+			margin-bottom: 14rpx;
 		}
-
 		.jisuan {
 			font-size: 24rpx;
 			color: #333333;
-			margin-top: 24rpx;
-			margin-bottom: 30rpx;
+			margin-top: 16rpx;
+			margin-bottom: 10rpx;
 		}
-
 		.qian {
 			width: 100%;
 			display: flex;
 			justify-content: space-between;
-
 			.yuan {
 				font-size: 24rpx;
 				color: #333333;
 			}
-
 			.yajin {
 				font-size: 24rpx;
 				color: #808080;
 			}
 		}
 	}
-
 	.list_box {
 		.ulbox {
 			width: 100%;
 			overflow: scroll;
-
+			margin-top: 20rpx;
 			.ulli {
 				display: flex;
 				width: 170vh;
-
 				.li {
 					flex: 1;
 					border: 1rpx solid #ccc;
@@ -1619,11 +1533,9 @@ import { Counter } from './blufi/crypto/aes'
 					line-height: 88rpx;
 				}
 			}
-
 			.olli {
 				display: flex;
 				width: 170vh;
-
 				.li {
 					flex: 1;
 					border: 1rpx solid #ccc;
@@ -1636,44 +1548,36 @@ import { Counter } from './blufi/crypto/aes'
 			}
 		}
 	}
-
 	.time_list {
 		width: 100%;
-		border-bottom: 1px solid #D8D8D8;
-		padding-bottom: 34rpx;
 		box-sizing: border-box;
-
 		.time_top {
 			display: flex;
 			justify-content: space-between;
 			margin-top: 20rpx;
-
 			view {
 				font-size: 40rpx;
 				color: #3D3D3D;
 				font-weight: 600;
 			}
 		}
-
 		.time_bot {
 			display: flex;
 			justify-content: space-between;
 			margin-top: 30rpx;
-
 			view {
 				font-size: 24rpx;
 				color: #666666;
 			}
 		}
 	}
-
 	.dltop {
 		width: 100%;
 		height: 224rpx;
 		background: #8883F0;
 		border-radius: 16rpx 16rpx 16rpx 16rpx;
 		margin: auto;
-		margin-top: 36rpx;
+		// margin-top: 36rpx;
 		padding-bottom: 20rpx;
 		box-sizing: border-box;
 
@@ -2027,7 +1931,7 @@ import { Counter } from './blufi/crypto/aes'
 				height: 60rpx;
 				// background: #FFFFFF;
 				border-radius: 0 0 28rpx 28rpx;
-
+                padding-bottom: 30rpx;box-sizing: border-box;margin-top: 0;margin-top: 20rpx;padding: 0 20rpx;box-sizing: border-box;box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0,0,0,0.08);
 				.tit {
 					margin-left: 40rpx;
 
diff --git a/page_components/shiming.vue b/page_components/shiming.vue
index 84940b1..f38db8b 100644
--- a/page_components/shiming.vue
+++ b/page_components/shiming.vue
@@ -1,12 +1,12 @@
 <template>
 	<view class="pages">
-		<u-navbar :custom-back="btnback" title="实名认证" :border-bottom="false" :background="bgc" back-icon-color="#fff" title-color='#fff'
-			title-size='36' height='44'></u-navbar>
+		<u-navbar :custom-back="btnback" title="实名认证" :border-bottom="false" :background="bgc" back-icon-color="#fff"
+			title-color='#fff' title-size='36' height='44'></u-navbar>
 		<!-- 未有实名认证 -->
 		<view class="" v-if="flags">
 			<view class="listval">
 				<view class="tit"> 真实姓名</view>
-				<view class="but"> <input type="text" placeholder="请输入真实姓名" v-model="name"/> </view>
+				<view class="but"> <input type="text" placeholder="请输入真实姓名" v-model="name" /> </view>
 			</view>
 			<view class="listval">
 				<view class="tit"> 身份证号</view>
@@ -18,6 +18,8 @@
 				<view class="yz" v-else>
 				</view>
 			</view>
+			<image :src="upLoadPositiveImg" @click="uploadpicone" class="sfz" mode=""></image>
+			<image :src="upLoadReverseImg" @click="uploadpictwo" class="sfz" mode=""></image>
 			<view class="" style="width: 100%;margin-top: 50rpx;color: red;text-align: center;">
 				提现需实名认证，请输入真实有效实名信息！
 			</view>
@@ -25,7 +27,7 @@
 		<view class="" v-else>
 			<view class="listval">
 				<view class="tit"> 真实姓名</view>
-				<view class="but"> <input type="text" placeholder="请输入真实姓名" disabled="true" v-model="name"/> </view>
+				<view class="but"> <input type="text" placeholder="请输入真实姓名" disabled="true" v-model="name" /> </view>
 			</view>
 			<view class="listval">
 				<view class="tit"> 身份证号</view>
@@ -42,17 +44,17 @@
 			</view>
 		</view>
 		<!-- 已有实名认证 -->
-		
-		
+
+
 		<view class="baocun" @click="btnyanz" v-if="flag">
 			进行人脸验证
 		</view>
 		<view class="baocun" @click="btnyz" v-else>
 			进行人脸验证
 		</view>
-		
-		
-		
+
+
+
 	</view>
 </template>
 
@@ -60,6 +62,8 @@
 	export default {
 		data() {
 			return {
+				upLoadPositiveImg: 'https://api.ccttiot.com/smartmeter/img/static/u8j3NbBd9djM3nMwaekr', // 正面身份证
+				upLoadReverseImg: 'https://api.ccttiot.com/smartmeter/img/static/uDKPwhqXwacrKSKIuPr9', //反面
 				bgc: {
 					backgroundColor: "#8883f0",
 				},
@@ -68,14 +72,16 @@
 				tel: '',
 				flag: false,
 				yzflag: true,
-				type:'',
-				user:{},
-				flags:false
+				type: '',
+				user: {},
+				flags: false,
+				token: ''
 			}
 		},
 		onLoad(option) {
-            this.type = option.type
+			this.type = option.type
 			this.getuserinfo()
+			this.getQiniuToken()
 		},
 		// 分享到好友（会话）
 		onShareAppMessage: function() {
@@ -94,24 +100,76 @@
 			}
 		},
 		methods: {
+			// 上传身份证正面照
+			uploadpicone() {
+				let that = this
+				that.btnshangchuan((url) => {
+					that.upLoadPositiveImg = url
+					that.$u.post(`/common/idcardOcr?url=${encodeURIComponent(that.upLoadPositiveImg)}`).then(res => {
+						if (res.code == 200) {
+							this.name = res.data.name
+							this.names = res.data.number
+						}
+					})
+				})
+			},
+			// 上传身份证反面照
+			uploadpictwo() {
+				this.btnshangchuan((url) => {
+					this.upLoadReverseImg = url
+				})
+			},
+			btnshangchuan(callback) {
+				let _this = this;
+				let math = 'static/' + _this.$u.guid(20);
+				uni.chooseImage({
+					count: 1,
+					type: 'all',
+					success(res) {
+						const tempFilePaths = res.tempFiles;
+						wx.uploadFile({
+							url: 'https://up-z2.qiniup.com',
+							name: 'file',
+							filePath: tempFilePaths[0].path,
+							formData: {
+								token: _this.token,
+								key: 'smartmeter/img/' + math
+							},
+							success: function(uploadRes) {
+								let str = JSON.parse(uploadRes.data)
+								let finalUrl = 'https://api.ccttiot.com/' + str.key
+								callback(finalUrl); // 调用回调函数，并传递 URL
+							}
+						})
+					}
+				})
+			},
+			// 获取上传图片token
+			getQiniuToken() {
+				this.$u.get("/common/qiniu/uploadInfo").then((res) => {
+					if (res.code == 200) {
+						this.token = res.token
+					}
+				})
+			},
 			getuserinfo() {
 				this.$u.get("/app/user/userInfo").then((res) => {
 					if (res.code == 200) {
 						this.name = res.data.realName
 						this.names = res.data.realIdCard
-						if(res.data.isReal == true){
+						if (res.data.isReal == true) {
 							this.flags = false
 							this.flag = true
-						}else{
+						} else {
 							this.flags = true
 							this.flag = false
 						}
 					}
 				})
 			},
-			
+
 			// 直接进行验证
-			btnyanz(){
+			btnyanz() {
 				this.$u.put("/app/user/riskRealName").then((res) => {
 					if (res.code == 200) {
 						let https = encodeURIComponent(res.data.jumpUrl)
@@ -127,55 +185,55 @@
 					}
 				})
 			},
-			
-			btnback(){
+
+			btnback() {
 				uni.reLaunch({
-					url:'/page_user/yetx'
+					url: '/page_user/yetx'
 				})
 			},
-			
+
 			btnyz() {
-                function isAgeOver18(idCard) {  
-                    // 提取出生年份  
-                    const birthYear = idCard.substr(6, 4); // 身份证号码的第7到第10位是出生年份  
-                    // 获取当前年份  
-                    const currentYear = new Date().getFullYear();  
-                    // 计算年龄  
-                    const age = currentYear - parseInt(birthYear, 10);  
-                    // 判断是否年满18岁  
-                    return age >= 18;  
-                }  
-                const idCard = this.names
-                // 调用函数并输出结果  
-                if (isAgeOver18(idCard)) {  
-                    console.log('身份证对应的用户已年满18岁'); 
-					 let data = {
-					 	realName: this.name,
-					 	realIdCard: this.names,
-					 	type:this.type
-					 }
-					 this.$u.put('/app/user/realName', data).then(res => {
-					 	if (res.code == 200) {
-					 		let https = encodeURIComponent(res.data.jumpUrl)
-					 		uni.navigateTo({
-					 			url: '/pages/sjshiming?https=' + https
-					 		})
-					 	} else {
-					 		uni.showToast({
-					 			title: res.msg,
-					 			icon: 'none',
-					 			duration: 2000
-					 		})
-					 	}
-					 })
-                } else {  
-                    console.log('身份证对应的用户未满18岁');  
+				function isAgeOver18(idCard) {
+					// 提取出生年份  
+					const birthYear = idCard.substr(6, 4); // 身份证号码的第7到第10位是出生年份  
+					// 获取当前年份  
+					const currentYear = new Date().getFullYear();
+					// 计算年龄  
+					const age = currentYear - parseInt(birthYear, 10);
+					// 判断是否年满18岁  
+					return age >= 18;
+				}
+				const idCard = this.names
+				// 调用函数并输出结果  
+				if (isAgeOver18(idCard)) {
+					console.log('身份证对应的用户已年满18岁');
+					let data = {
+						realName: this.name,
+						realIdCard: this.names,
+						type: this.type
+					}
+					this.$u.put('/app/user/realName', data).then(res => {
+						if (res.code == 200) {
+							let https = encodeURIComponent(res.data.jumpUrl)
+							uni.navigateTo({
+								url: '/pages/sjshiming?https=' + https
+							})
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					})
+				} else {
+					console.log('身份证对应的用户未满18岁');
 					uni.showToast({
 						title: '实名认证需年满18岁',
 						icon: 'none',
 						duration: 2000
 					})
-                }
+				}
 			}
 
 		}
@@ -191,6 +249,13 @@
 		padding-bottom: 15rpx;
 	}
 
+	.sfz {
+		width: 100%;
+		height: 410rpx;
+		margin: auto;
+		margin-top: 30rpx;
+	}
+
 	.pages {
 		background-color: #F7FAFE !important;
 		height: 100vh;
diff --git a/page_fenbao/hehuoren/shebeilist.vue b/page_fenbao/hehuoren/shebeilist.vue
index c21d51a..c9f13b5 100644
--- a/page_fenbao/hehuoren/shebeilist.vue
+++ b/page_fenbao/hehuoren/shebeilist.vue
@@ -11,11 +11,14 @@
 								<view class="card" @click="btnxq(item.deviceId)">
 									<view class="card_left">
 										<view class="card_left_tit">
-											{{item.deviceName}}
+											{{item.deviceName.length > 5 ? item.deviceName.slice(0,5) + '...' : item.deviceName}}
 										</view>
-										<view class="card_left_sta">
+										<view class="" style="color: #95989D;" v-if="item.modelTags.some(tag => tag == 1) && !item.modelTags.some(tag => tag == 2) && !item.modelTags.some(tag => tag == 3)">
+											蓝牙版
+										</view>
+										<view class="card_left_sta" v-else>
 											网络:<view class="" style="width: 10rpx;"></view>
-											 <text v-if="item.wifi == null && !item.modelTags.some(tag => tag == 3) || item.wifi == '创特物联TP'" style="color: red;" @click.stop="btnwifi(item.mac)">未配网</text>
+											 <text v-if="item.wifi == null && !item.modelTags.some(tag => tag == 3)" style="color: red;" @click.stop="btnwifi(item.mac)">未配网</text>
 											 <text v-else>
 												 <text v-if="item.onlineStatus == 0" style="color: red;">离线</text>
 												 <text v-else style="color: #00BA88;">在线</text>
@@ -23,7 +26,7 @@
 											 <view class="" style="width: 20rpx;"></view>
 											状态:<view class="" style="width: 10rpx;"></view>
 											<view class="sta_txt" v-if="item.status==3">
-												维修中
+												调试中
 											</view>
 											<view class="sta_txt" v-if="item.status==2" style="color:red;">
 												使用中
@@ -35,6 +38,9 @@
 										<view class="card_left_no">
 											S/N码：{{item.deviceNo}}
 										</view>
+										<view class="card_left_no">
+											店铺：{{item.storeName.length > 5 ? item.storeName.slice(0,5) + '...' : item.storeName}}
+										</view>
 									</view>
 									<view class="card_right">
 										<image v-if="item.customPicture" :src="item.customPicture" mode="aspectFit"></image>
@@ -135,8 +141,11 @@
 				}
 			},
 			btnxq(id) {
+				// uni.navigateTo({
+				// 	url: '/page_user/sbdetail?id=' + id
+				// })
 				uni.navigateTo({
-					url: '/page_user/sbdetail?id=' + id
+					url:'/page_fenbao/hehuoren/shebeixq?id=' + id
 				})
 			},
 		}
@@ -175,15 +184,15 @@
 
 						.card {
 							display: flex;
-							margin-top: 20rpx;
+							// margin-top: 20rpx;
 							width: 658rpx;
-							height: 250rpx;
+							height: 280rpx;
 							background: #fff;
 							box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(255, 255, 255, 0);
 							border-radius: 24rpx 24rpx 24rpx 24rpx;
 
 							.card_left {
-								width: 310rpx;
+								// width: 310rpx;
 								margin-top: 46rpx;
 								margin-left: 50rpx;
 
diff --git a/page_fenbao/hehuoren/shebeixq.vue b/page_fenbao/hehuoren/shebeixq.vue
new file mode 100644
index 0000000..443535a
--- /dev/null
+++ b/page_fenbao/hehuoren/shebeixq.vue
@@ -0,0 +1,2164 @@
+<template>
+	<view class="page">
+		<u-navbar  :title="tittxt" :border-bottom="false" :background="bgc" back-icon-color="#000" title-color='#000'
+			title-size='36' height='50' id="navbar">
+			<!-- :custom-back="btns" -->
+		</u-navbar>
+		<view class="zhuhu">
+			<view class="card1">
+				<view class="mid">
+					<view class="mid_right">
+						<view class="mid_top" @click="btnxgname">
+							{{ deviceInfo.deviceName == null ? '' : deviceInfo.deviceName }} <u-icon name="edit-pen-fill" color="#333" size="32"></u-icon>
+						</view>
+						<view class="txt" v-if="deviceInfo" style="width: 100%;margin-top: 6rpx;">
+							S / N：{{ deviceInfo.deviceNo == null ? '' : deviceInfo.deviceNo }}</view>
+						<view class="txt" v-if="deviceInfo" style="width: 100%;margin-top: 6rpx;">
+							MAC：{{ deviceInfo.mac == null ? '' : deviceInfo.mac }}</view>
+						<view class="mid_bot">
+							<div class="tip" v-if="deviceInfo.onlineStatus==1">
+								<text style="color: #00BA88;border: 1px solid #00BA88;padding: 2rpx 8rpx;box-sizing: border-box;border-radius: 10rpx;">在线</text>
+							</div>
+							<div class="tip" v-if="deviceInfo.onlineStatus==0">
+								<text style="color: #F76D6D;border: 1px solid #F76D6D;padding: 2rpx 8rpx;box-sizing: border-box;border-radius: 10rpx;">离线</text>
+							</div>
+							<div class="tip" v-if="deviceInfo.status==1">
+								<text style="color: #00BA88;border: 1px solid #00BA88;padding: 2rpx 8rpx;box-sizing: border-box;border-radius: 10rpx;">空闲</text>
+							</div>
+							<div class="tip" v-if="deviceInfo.status==2">
+								<text style="color: #00BA88;border: 1px solid #00BA88;padding: 2rpx 8rpx;box-sizing: border-box;border-radius: 10rpx;">使用中</text>
+							</div>
+							<div class="tip" v-if="deviceInfo.storeName != null">
+								<text style="color: #8883F0;border: 1px solid #8883F0;padding: 2rpx 8rpx;box-sizing: border-box;border-radius: 10rpx;">{{deviceInfo.storeName.length > 5 ? deviceInfo.storeName.slice(0,5) + '...' : deviceInfo.storeName}}</text>
+							</div>
+						</view>
+						<view style="font-size: 28rpx;color: #95989D;margin-top: 18rpx;">
+						  	<view style="display: flex;align-items: center;">
+								<image style="width: 38rpx;height: 38rpx;margin-right: 10rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uFCAaWnRnqQK4SwPp7dm" mode=""></image>
+						  		<text style="color: #00BA88;" v-if="ver_dataflag == 3">蓝牙已连接</text>
+						  		<text style="color: #0079F5;" v-if="ver_dataflag == 2">蓝牙连接中</text>
+						  		<text style="color: #F76D6D;" v-if="ver_dataflag == 1">蓝牙未连接</text>
+						  	</view>
+						</view>
+					</view>
+					<view class="mid_left" style="position: relative;">
+						<view v-if="opflag"
+							style="border: 0;outline: none;width: 196rpx;padding-left: 0rpx;height: 196rpx;border-radius: 16rpx;"
+							@click="btnpic">
+							<image :src="imglist" mode="aspectFit"
+								style="width: 196rpx;height: 196rpx;border-radius: 10rpx;"></image>
+						</view>
+						<image v-else :src="imglist" mode="aspectFit"
+							style="width: 196rpx;height: 196rpx;border-radius: 0rpx;"></image>
+						<text class="lanyalx">{{deviceInfo.model == undefined ? '' : deviceInfo.model}}</text>
+
+						<ksp-cropper mode="free" :width="142" :height="142" :maxWidth="1024" :maxHeight="1024"
+							:url="url" @cancel="oncancel" @ok="onok"></ksp-cropper>
+					</view>
+				</view>
+				<view class="bot">
+					
+				</view>
+			</view>
+			<view class="card2">
+				<view class="" style="display: flex;justify-content: space-between;padding-right: 66rpx;box-sizing: border-box;align-items: center;">
+					<view class="tit" style="border-left: 14rpx solid #8883F0;padding-left: 24rpx;">实时参数</view>
+					<view @click="shuaxin" style="display: flex;color: #8883F0;justify-content: center;align-items: center;box-sizing: border-box;">
+						<!-- 点击刷新 -->
+						<image style="width: 60rpx;height: 60rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uOXH8rIsA5tSRyYynLgD" mode="aspectFit"></image>
+					</view>
+				</view>
+				<view class="bot_right">
+					<view class="cont" style="text-align: center;">
+						<view class="tit">
+							{{deviceInfo.voltage == null ? 0 : deviceInfo.voltage}}
+						</view>
+						<view class="txt">
+							电压（V）
+						</view>
+					</view>
+					<view class="cont" style="text-align: center;">
+						<view class="tit">
+							{{deviceInfo.electricity == null ? 0 : deviceInfo.electricity}}
+						</view>
+						<view class="txt">
+							电流（A）
+						</view>
+					</view>
+					<view class="cont" style="text-align: center;">
+						<view class="tit">
+							{{deviceInfo.realTimePower == null ? 0 : deviceInfo.realTimePower}}
+						</view>
+						<view class="txt">
+							功率（W）
+						</view>
+					</view>
+				</view>
+               <view class="" style="display: flex;margin-top: 20rpx;padding: 50rpx;box-sizing: border-box;width: 100%;
+               height: 80rpx;align-items: center;justify-content: space-between;background-color: #fff;border-radius: 20rpx;font-size: 32rpx;color: #3D3D3D;">
+               	<view class="bot">开关状态：{{tdtxt}}</view>
+               	<view class="cont" @click="btnkq">
+               		<view class="top" style="padding-top: 10rpx;">
+               			<view class="rt">
+               				<image v-if="imgflag" style="width: 160rpx;height: 80rpx;"
+               					src="https://api.ccttiot.com/smartmeter/img/static/uccaWar4FDp37op7haWM " mode="aspectFit">
+               				</image>
+               				<image style="width: 160rpx;height: 80rpx;" v-else
+               					src="https://api.ccttiot.com/smartmeter/img/static/ur9HRtZKY7YcxGewJARz" mode="aspectFit">
+               				</image>
+               			</view>
+               		</view>
+               	</view>
+               </view>
+			</view>
+			<view class="card2" style="padding-bottom: 40rpx;">
+				<view class="tit" style="border-left: 14rpx solid #8883F0;padding-left: 24rpx;">设备剩余</view>
+				<view class="bot_right">
+					<view class="cont" style="text-align: center;">
+						<view class="tit">
+							{{deviceInfo.surplusEleDb == null || Number(deviceInfo.surplusEleDb) < 0 ? '--' : deviceInfo.surplusEleDb}}
+						</view>
+						<view class="txt">
+							剩余度数
+						</view>
+					</view>
+					<view class="cont" style="text-align: center;">
+						<view class="tit">
+							{{formattedTime}}
+						</view>
+						<view class="txt">
+							剩余时长
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 当前订单 -->
+			<view v-if="sklistflag" @click="btnshdd" class="card2" style="padding-bottom: 30rpx;box-sizing: border-box;margin-top: 20rpx;">
+				<view class="tit" style="border-left: 14rpx solid #8883F0;padding-left: 24rpx;display: flex;justify-content: space-between;padding-right: 40rpx;margin-bottom: 20rpx;">当前订单 <text style="color: #8883F0;font-size: 32rpx;font-weight: 400;">查看</text> </view>
+                 <view class="aa">
+                 	<text>用户</text> <text>{{sklist.userName}}</text>
+                 </view>
+				 <view class="aa">
+				 	<text>计价方式</text> <text v-if="sklist.suitFeeType == 1">计时收费</text>
+				<text v-if="sklist.suitFeeType == 2">按量收费</text>
+				<text v-if="sklist.suitFeeType == 3">分时段按量收费</text>
+				<text v-if="sklist.suitFeeType == 4">分时段按时收费</text>
+				 </view>
+				 <view class="aa">
+				 	<text>下单时间</text> <text>{{sklist.suitStartTime}}</text>
+				 </view>
+			</view>
+			<view class="card3" v-if="opflag">
+				<view class="tit" style="border-left: 14rpx solid #8883F0;padding-left: 24rpx;font-weight: 600;">其他功能</view>
+				<view class="cont_box">
+						<view class="cont" @click="topage(0)">
+							<view class="top">
+								<image src="https://api.ccttiot.com/smartmeter/img/static/u2ALEsvAJrHnW7nhrTVD" mode="aspectFit"
+									style="width: 44rpx;height: 40rpx;"></image>
+									<view class="bot">充值记录</view>
+							</view>
+						</view>
+						<view class="cont" @click="topage(3)" v-if="userTpye_userid == deviceInfo.userId">
+							<view class="top">
+								<image src="https://api.ccttiot.com/smartmeter/img/static/uJmpaxyrv34a1EW5lWQv" mode="aspectFit"
+									style="width: 44rpx;height: 44rpx;"></image>
+									<view class="bot">收费方式</view>
+							</view>
+						</view>
+						<view class="cont" @click="topage(1)">
+							<view class="top">
+								<image src="https://api.ccttiot.com/smartmeter/img/static/uhsqQVT62DOTdW8qW7ez" mode="aspectFit"
+									style="width: 44rpx;height: 44rpx;"></image>
+									<view class="bot">归零</view>
+							</view>
+						</view>
+						<view class="cont" @click="topage(6)" v-if="deviceInfo.allowSwitch == true">
+							<view class="top">
+								<image style="width: 44rpx;height: 44rpx;"
+									src="https://api.ccttiot.com/smartmeter/img/static/u9vzIeLLorfYuoZnxBDZ" mode="aspectFit">
+								</image>
+								<view class="bot">充值</view>
+							</view>
+						</view>
+						<view class="cont" @click="topage(5)" v-if="modelId.some(tag => tag == 2)">
+							<view class="top">
+								<image style="width: 44rpx;height: 44rpx;"
+									src="https://api.ccttiot.com/smartmeter/img/static/ule3wEEDaXzfXCUCM1Ks" mode="aspectFit">
+								</image>
+								<view class="bot">配网</view>
+							</view>
+						</view>
+						<view class="cont" @click="qrFun">
+							<view class="top">
+								<image style="width: 44rpx;height: 44rpx;"
+									src="https://api.ccttiot.com/smartmeter/img/static/uGjm0qpPFeDJZ2hUFexi" mode="aspectFit">
+								</image>
+								<view class="bot">二维码</view>
+							</view>
+						</view>
+						<view class="cont" @click="topage(2)">
+							<view class="top">
+								<image src="https://api.ccttiot.com/smartmeter/img/static/ueQ5V8QAidDZGt0FpqXb" mode="aspectFit"
+									style="width: 44rpx;height: 40rpx;"></image>
+									<view class="bot">上报异常</view>
+							</view>
+						</view>
+						<view class="cont" @click="sremakes">
+							<view class="top">
+								<image src="https://api.ccttiot.com/smartmeter/img/static/u6iXsrzPKTQXsY1Zq1i7" mode="aspectFit"
+									style="width: 44rpx;height: 40rpx;"></image>
+									<view class="bot">所属店铺</view>
+							</view>
+						</view>
+						<view class="cont" @click="deldevice">
+							<view class="top">
+								<image src="https://api.ccttiot.com/smartmeter/img/static/ucjqb5QAYLn1694aY5LX" mode="aspectFit"
+									style="width: 44rpx;height: 40rpx;"></image>
+									<view class="bot">解除绑定</view>
+							</view>
+						</view>
+						<view class="cont" @click="jiaozhunflag = true">
+							<view class="top">
+								<image src="https://api.ccttiot.com/smartmeter/img/static/uIIu0awWVaCskkQMyJYp" mode="aspectFit"
+									style="width: 44rpx;height: 40rpx;"></image>
+									<view class="bot">电量校准</view>
+							</view>
+						</view>
+						<!-- <view class="cont" @click="topage(4)">
+							<view class="top" style="border: 0;">
+								<image style="width: 44rpx;height: 44rpx;"
+									src="https://api.ccttiot.com/smartmeter/img/static/uOUM2aclDz2ZnRxOll9g" mode="aspectFit">
+								</image>
+								<view class="bot">固件升级</view>
+							</view>
+						</view> -->
+				</view>
+			</view>
+		</view>
+
+		<view class="tanc" v-if="vipflag">
+			<view class="tit">请输入您需要充值的时长或度数</view>
+			<input type="number" :focus="focus" v-model="cztime" placeholder="请输入时长或度数" />
+			<view class="inpss"  @click="btnxzdw">{{danwei}}</view>
+			<!-- #ifdef MP-WEIXIN -->
+			<u-icon name="arrow-down" style="position: fixed;top: 234rpx;right: 60rpx;" color="#999" size="28"></u-icon>
+			<!-- #endif -->
+			<view class="xian"></view>
+			<view class="anniu">
+				<text @click="btnqx">取消</text> <text style="border-left: 1px solid #eee;color: #8883F0;"
+					@click="trueje">确定</text>
+			</view>
+		</view>
+		<view class="maskss" v-if="vipflag"></view>
+		<!-- 蓝牙连接 -->
+		<view class="bluetoothbox" v-if="bluetoothflag">
+			<view class="stop">
+				正在连接该设备蓝牙
+			</view>
+			<view class="xtop">
+				请将手机与设备尽量靠近
+			</view>
+			<image src="https://api.ccttiot.com/smartmeter/img/static/ucDphMKsozqwwllJTAKL" mode="aspectFit"></image>
+		</view>
+
+		<!-- 蓝牙连接失败 -->
+		<view class="bluetoothbox" v-if="shibaiflag">
+			<image class="img" src="https://api.ccttiot.com/smartmeter/img/static/uTb3vSlbcHdPMFQMBjyL" mode="aspectFit"></image>
+			<view class="one">
+				蓝牙连接失败
+			</view>
+			<view class="two">
+				请确保手机足够靠近设备
+			</view>
+			<view class="thr">
+				并且设备处于上电状态
+			</view>
+			<view class="anfour">
+				<view class="qx" @click="btnlyqx">
+					取消
+				</view>
+				<view class="cx" @click="btnkq">
+					重新连接
+				</view>
+			</view>
+		</view>
+		<!-- 选择单位 -->
+		<u-select v-model="showflag" :list="listdanwei" title='选择单位' @confirm="btnconfirm"></u-select>
+        <!-- 选择店铺 -->
+        <u-select v-model="showshop" :list="wateringList" @confirm="confirms"></u-select>
+		<!-- 展示二维码 -->
+		<view class="imgewm" v-if="wemflag" @longpress="saveCanvas">
+			<canvas canvas-id="qrcode" style="height: 100%;margin: 0 auto;" />
+			<view class="" style="width: 100%;text-align: center;margin-top: 20rpx;">
+				SN:{{deviceNo}}
+			</view>
+			<view class=""
+				style="border: 1px solid; padding: 20rpx;box-sizing: border-box;width: 100%;text-align: center;margin-top: 40rpx;"
+				@click="wemflag = false">
+				关闭二维码
+			</view>
+		</view>
+		<view class="imgewmflag" v-if="wemflag" @click.stop="ewmyc"></view>
+
+		<view v-if="btnmsk"
+			style="width: 100%;height: 100vh;position: fixed;top: 0;left: 0;background-color: #000;opacity: .1;z-index: 999;">
+		</view>
+		
+		<u-popup v-model="showmc" mode="center" border-radius='20'>
+			<view class="popcard" v-if="showmc">
+				<view class="tit">
+					修改名称
+				</view>
+				<view class="ipt">
+					<u-input v-model="xgname" placeholder=" " border='surround' placeholder-style='font-size: 24rpx;' />
+				</view>
+				<view class="btnbox">
+					<view class="btn2" @click="close">
+						取消
+					</view>
+					<view class="btn1" @click="subname">
+						确定
+					</view>
+				</view>
+			</view>
+		 </u-popup>
+		 
+		 <!-- 电量校准 -->
+		 <view class="dianliang" v-if="jiaozhunflag">
+		 	 <image class="bj" src="https://api.ccttiot.com/smartmeter/img/static/uvJFkqJb264nOgRunshs" mode=""></image>
+			 <view class="shuru">
+			 	<image @click="btnjian" src="https://api.ccttiot.com/smartmeter/img/static/umGCPelSgd4GAwClNYcN" mode=""></image>
+				<input type="text" v-model="wxs" :disabled="true"/>
+				<image @click="btnadd" src="https://api.ccttiot.com/smartmeter/img/static/uyHk8ogQq0MPOURwPXbT" mode=""></image>
+			 </view>
+			 <view class="anniu" @click="btndian">
+			 	确认校准
+			 </view>
+		 </view>
+		 <view class="mask" v-if="jiaozhunflag" @click="jiaozhunflag = false"></view>
+		
+	</view>
+</template>
+
+<script>
+	var xBlufi = require("@/page_components/blufi/xBlufi.js")
+	export default {
+		data() { 
+			return {
+				showmc:false,
+				xgname:'',
+				suitSurplus:'',
+				showflag: false,
+				imgflag: false,
+				wemflag: false,
+				btnmsk: false,
+				bluetoothflag: false,
+				shibaiflag: false,
+				danwei: '请选择时长单位',
+				wateringList: [],
+				listdanwei: [{
+					value: 2,
+					label: '小时'
+				}, {
+					value: 3,
+					label: '分钟'
+				}, {
+					value: 4,
+					label: '秒钟'
+				}, {
+					value: 0,
+					label: '度'
+				}],
+				bgc: {
+					backgroundColor: "#F9F8FF",
+				},
+				ec: {
+					lazyLoad: true
+				},
+				deviceInfo: {},
+				loadings: false,
+				info: '',
+				checked: false,
+				tittxt: "设备详情",
+				titlist: [],
+				tdtxt: '开启',
+				curtitidx: 0,
+				id: '',
+				focus: false,
+				timeday: '',
+				imglist: '',
+				token: '',
+				userImgs: '',
+				imgflag: true,
+				mac: "",
+				name: '',
+				deviceId: '',
+				storeId: '',
+				qrResult: '',
+				devicesList: [],
+				setMode: null,
+				vipflag: false,
+				cztime: '',
+				opflag: true,
+				timer: null,
+				url: "",
+				deviceNo: '',
+				modelId: [],
+				damweiid: '',
+				intervalId: null,
+				sklist:{},
+				sklistflag:false,
+				ljtype:'2',
+				userTpye_userid:'',
+				ver_dataflag:2,
+				showshop: false,
+				devicesarr:[],
+				fanhui:'',
+				xishu:1,
+				wxs:'',
+				jiaozhunflag:false
+			}
+		},
+		onLoad(option) {
+			xBlufi.notifyStartDiscoverBle({'isStart': true})
+			xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent)
+			let id = option.id
+			this.id = id
+			this.gettanc()
+			if(option.fanhui){
+				this.fanhui = option.fanhui
+			}
+			if (option.flag) {
+				this.opflag = false
+			} else {
+				this.opflag = true
+			}
+		},
+		// 分享到好友（会话）
+		onShareAppMessage: function() {
+			return {
+				title: '创想物联',
+				path: '/pages/shouye/index'
+			}
+		},
+		// 分享到朋友圈  
+		onShareTimeline: function() {
+			return {
+				title: '创想物联',
+				query: '',
+				path: '/pages/shouye/index'
+			}
+		},
+		computed: {
+			formattedTime() {
+				if (this.timeday.days > 0) {
+					// 只展示天和小时  
+					return `${this.timeday.days}天${this.timeday.hours}小时`
+				} else if (this.timeday.hours > 0) {
+					// 展示小时和分钟  
+					return `${this.timeday.hours}小时${this.timeday.minutes}分钟`
+				} else if (this.timeday.minutes > 0) {
+					// 展示分钟和秒  
+					return `${this.timeday.minutes}分钟${this.timeday.seconds}秒`
+				} else if (this.timeday.seconds == 0) {
+					this.deviceInfo.status = 1
+					this.imgflag = false
+					this.tdtxt = '关闭'
+					return this.timeday.seconds > 0 ? `${this.timeday.seconds}秒` : '0'
+				} else {
+					// 展示秒或0（如果秒也为0）  
+					return this.timeday.seconds > 0 ? `${this.timeday.seconds}秒` : '0'
+				}
+			}
+		},
+		beforeDestroy() {
+			// 组件销毁前清除定时器，防止内存泄漏  
+			if (this.timer) {
+				clearInterval(this.timer)
+				this.timer = null
+				console.log('已销毁')
+			}
+		},
+		onHide() {
+			if (this.timer || this.intervalId) {
+				clearInterval(this.intervalId)
+				clearInterval(this.timer)
+				this.timer = null
+				this.intervalId = null
+				console.log('已销毁')
+			}
+		},
+		onUnload: function() {
+			xBlufi.notifyStartDiscoverBle({
+				'isStart': false
+			})
+			xBlufi.notifyConnectBle({
+				isStart: false,
+				deviceId: this.deviceId,
+				name: this.name
+			})	
+			if (this.timer || this.intervalId) {
+				clearInterval(this.intervalId)
+				clearInterval(this.timer)
+				this.timer = null
+				this.intervalId = null
+				console.log('已销毁')
+			}
+		},
+		onShow() {
+			this.userTpye_userid = uni.getStorageSync('userType').userId
+			this.shibaiflag = false
+			this.getshuax()
+			this.getQiniuToken()
+		},
+		mounted() {
+			this.drawCanvas()
+		},
+		methods: {
+			// 点击减电量系数
+			btnjian() {
+			    const value = Number(this.wxs.slice(0, -1)) - 0.05
+			    this.wxs = value.toFixed(2) + '%'
+			},
+			btnadd() {
+			    const value = Number(this.wxs.slice(0, -1)) + 0.05
+			    this.wxs = value.toFixed(2) + '%'
+			}, 
+			// 点击校准电量
+			btndian(){
+				let data = {
+					deviceId: this.id,
+					wxs: this.wxs.slice(0,-1) / 100,
+				}
+				this.$u.put('/mch/device/setWxs', data).then(res => {
+					if (res.code == 200) {
+						this.jiaozhunflag = false
+						uni.showToast({
+							title: '校准成功',
+							icon: 'success',
+							duration: 2000
+						})
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+				})
+			},
+			// 点击修改名称
+			btnxgname(){
+				this.xgname = this.deviceInfo.deviceName
+				this.showmc = true
+			},
+			// 点击修改名称
+			subname(){
+				let data = {
+					deviceId: this.id,
+					deviceName: this.xgname,
+				}
+				this.$u.put('/app/device', data).then(res => {
+					if (res.code == 200) {
+						this.showmc = false
+						this.getshuax()
+						uni.showToast({
+							title: '修改成功',
+							icon: 'success',
+							duration: 2000
+						})
+					}
+				})
+			},
+			// 点击取消修改名称
+			close() {
+			    this.showmc = false
+			},
+			// 点击更换店铺
+			confirms(e){
+				let data = {
+					deviceId: this.id,
+					storeId:e[0].value
+				}
+				this.$u.put('/app/device', data).then(res => {
+					if (res.code == 200) {
+						this.getshuax()
+						uni.showToast({
+							title: '修改成功',
+							icon: 'success',
+							duration: 2000
+						})
+					}
+				})
+			},
+			sremakes() {
+				this.showshop = true
+			},
+			gettanc(){
+				this.$u.get('/app/store/listCount').then((res) => {
+					if (res.code == 200) {
+						this.total = res.total
+						if (res.data.length > 0) {
+							let arr = res.data.map(row => ({
+								value: row.storeId,
+								label: row.name 
+							}))
+							this.wateringList = arr.slice(1)
+						} 
+					}
+				})
+			},
+			// 解绑设备
+			deldevice() {
+				uni.showModal({  
+				    title: '确认解绑',  
+				    content: '您确定要解绑设备吗？',  
+				    success: (resModal) => {  
+				        if (resModal.confirm) { 
+				            this.$u.delete(`/app/device/mch/unbind/${this.id}`).then((res) => {  
+				                if (res.code == 200) {  
+				                    uni.showToast({  
+				                        title: '解除成功',  
+				                        icon: 'success',  
+				                        duration: 2000  
+				                    })
+				                    uni.reLaunch({
+				                    	url:'/pages/index/index'
+				                    })
+				                } else if(res.code == 500){  
+				                    uni.showToast({  
+				                        title: res.msg,  
+				                        icon: 'none',  
+				                        duration: 2000  
+				                    })
+				                }  
+				            })
+				        } else if (resModal.cancel) {
+				          
+				        }  
+				    }  
+				})
+			},
+			// 自定义返回
+			btns(){
+				// if(this.fanhui == 1){
+					uni.reLaunch({
+						url:'/pages/index/index'
+					})
+				// }else{
+				// 	uni.navigateBack()
+				// }
+			},
+			// 商户跳转进行中订单
+			btnshdd(){
+				uni.navigateTo({
+					url:'/pages/shanghudd?id=' + this.sklist.billNo
+				})
+			},
+			// 刷新
+			getshuax() {
+				this.$u.get(`/app/device/${this.id}/refreshIot`).then((res) => {
+					this.getDevice(this.id)
+				})
+			},
+			getshoukuan(){
+				this.$u.get(`/app/bill/incomeList?isUsing=true&deviceId=${this.deviceInfo.deviceId}`).then((res) => {
+					if(res.code == 200){
+						if(res.rows == null || res.rows.length == 0){
+							this.sklistflag = false
+						}else{
+							this.sklistflag = true
+							this.sklist = res.rows[0]
+							this.suitSurplus = res.rows[0].surplusEle
+						}
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 1500
+						})
+					}
+				})
+			},
+			// 点击刷新
+			shuaxin(){
+				this.$u.get(`/app/device/${this.id}/refreshIot`).then((res) => {
+					if(res.code == 200){
+						this.getDevice(this.id)
+						uni.showToast({
+							title: res.msg,
+							icon: 'success',
+							duration: 1500
+						})
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 1500
+						})
+					}
+				})
+			},
+			// 点击跳转固件更新页面
+			btnfirmware(){
+				uni.navigateTo({
+					url:'/pages/daili/gujian'
+				})
+			},
+			// 点击显示选择单位
+			btnxzdw(){
+				this.showflag = true
+				console.log(1);
+			},
+			// 选择时长单位
+			btnconfirm(e) {
+				console.log(e)
+				this.danwei = e[0].label
+				this.damweiid = e[0].value
+			},
+			drawCanvas() {
+				const ctx = uni.createCanvasContext('qrcode', this)
+				ctx.setFillStyle('#fff')
+				ctx.fillRect(10, 10, 250, 250)
+				ctx.draw()
+			},
+			// 长按保存二维码
+			saveCanvas() {
+				uni.canvasToTempFilePath({
+					canvasId: 'qrcode',
+					success: (res) => {
+						console.log(res.tempFilePath)// 打印图片路径  
+						uni.saveImageToPhotosAlbum({
+							filePath: res.tempFilePath,
+							success: function() {
+								uni.showToast({
+									title: '保存成功',
+									icon: 'success'
+								})
+							}
+						})
+					},
+					fail: (err) => {
+						console.error(err)
+					}
+				});
+			},
+			//**生成二维码**//
+			qrFun: function() {
+				uni.navigateTo({
+					url:'/page_fenbao/fenxiang?id=' + this.deviceNo
+				})
+			},
+			ewmyc() {
+				this.wemflag = false
+			},
+            // 点击连接取消
+			btnlyqx() {
+				this.shibaiflag = false
+				this.bluetoothflag = false
+			},
+			// 开启和关闭
+			btnkq() {
+				if(this.deviceInfo.allowSwitch == true){
+					if (this.deviceInfo.onlineStatus == 1) {
+						if (this.tdtxt == '开启') {
+							this.$u.put(`/app/device/${this.id}/changePower?status=0`).then((res) => {
+								if (res.code == 200) {
+									this.tdtxt = '关闭'
+									this.imgflag = false
+									this.deviceInfo.status = 1
+									uni.showToast({
+										title: res.msg,
+										icon: 'success',
+										duration: 2000
+									})
+								} else {
+									this.imgflag = true
+									this.tdtxt = '开启'
+									uni.showToast({
+										title: res.msg,
+										icon: 'none', 
+										duration: 2000
+									})
+								}
+							})
+						} else {
+							this.$u.put(`/app/device/${this.id}/changePower?status=1`).then((res) => {
+								if (res.code == 200) {
+									this.imgflag = true
+									this.tdtxt = '开启'
+									this.deviceInfo.status = 2
+									uni.showToast({
+										title: res.msg,
+										icon: 'success',
+										duration: 2000
+									})
+								} else {
+									this.imgflag = false
+									this.tdtxt = '关闭'
+									uni.showToast({
+										title: res.msg,
+										icon: 'none',
+										duration: 2000
+									})
+								}
+							})
+						}
+					} else {
+						if (this.ver_dataflag != 3) {
+							uni.showModal({
+								title: '温馨提示',
+								content: '蓝牙连接中，请尽量靠近设备！',
+								showCancel: false,
+								success: function(res) {
+									
+								}
+							})
+						} else {
+							this.shibaiflag = false
+							if (this.tdtxt == '开启') {
+								let that = this
+								that.tdtxt = '关闭'
+								that.imgflag = false
+								that.deviceInfo.status = 1
+								xBlufi.notifySendCustomData({
+									customData: 'close'
+								})
+								xBlufi.notifySendCustomData({
+									customData: '11close'
+								})
+								let data = {
+									mac:that.qrResult,
+									reason:'商户操作临时开关关闭',
+									command:'11close',
+									result:'成功'
+								}
+								that.$u.post(`/app/commandLog/bluetooth`,data).then(res => {})
+							} else {
+								let that = this
+								that.tdtxt = '开启'
+								that.imgflag = true
+								that.deviceInfo.status = 2
+								xBlufi.notifySendCustomData({
+									customData: 'open'
+								})
+								xBlufi.notifySendCustomData({
+									customData: '11open'
+								})
+                                let data = {
+                                	mac:that.qrResult,
+                                	reason:'商户操作临时开关开启',
+                                	command:'11open',
+                                	result:'成功'
+                                }
+                                that.$u.post(`/app/commandLog/bluetooth`,data).then(res => {})
+							}
+						}
+					}
+				}else{
+					uni.showToast({
+						title: '您没有权限操作',
+						icon: 'none',
+						duration: 2000
+					})
+				}
+			},
+			// 获取七牛云token
+			getQiniuToken() {
+				this.$u.get("/common/qiniu/uploadInfo").then((res) => {
+					if (res.code == 200) {
+						this.token = res.token
+					}
+				})
+			},
+            // 选择图像
+			btnpic() {
+				uni.chooseImage({
+					count: 1,
+					success: (rst) => {
+						this.url = rst.tempFilePaths[0]
+					}
+				})
+			},
+			onok(ev) {
+				this.url = ""
+				this.path = ev.path
+				let _this = this
+				let math = 'static/' + _this.$u.guid(20)
+				wx.uploadFile({
+					url: 'https://up-z2.qiniup.com',
+					name: 'file',
+					filePath: _this.path,
+					formData: {
+						token: _this.token,
+						key: 'smartmeter/img/' + math
+					},
+					success: function(res) {
+						// console.log(res);
+						let str = JSON.parse(res.data)
+						_this.userImgs = 'https://api.ccttiot.com/' + str.key
+						_this.imglist = _this.userImgs
+						let data = {
+							deviceId: _this.id,
+							customPicture: _this.imglist
+						}
+						_this.putdevice(data)
+					}
+				})
+			},
+			oncancel() {
+				// url设置为空，隐藏控件
+				this.url = ""
+			},
+			putdevice(data) {
+				this.$u.put('/app/device', data).then((res) => {
+					if (res.code == 200) {
+						uni.showToast({
+							title: '修改成功',
+							icon: 'success',
+							duration: 2000
+						})
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+				})
+			},
+            // 连接蓝牙函数
+            getlanya() {
+				if(this.ver_dataflag != 3){
+					console.log("进入111蓝牙连接")
+						this.czflag = true
+						this.ver_dataflag = 2
+						let that = this
+						if (that.deviceId != '') {
+							let systemInfo = uni.getSystemInfoSync()
+							if (systemInfo.platform == 'android') {
+								console.log(that.modelId,'...........')
+								that.modelId.some(item => {
+									if(item == 2){
+										console.log('配网')
+										let zuih = ''
+										if(that.deviceId.slice(-1) == 8){
+											zuih = 'A'
+										}else if(that.deviceId.slice(-1) == 9){
+											zuih = 'B'
+										}else if(that.deviceId.slice(-1) == 'A'){
+											zuih = 'C'
+										}else if(that.deviceId.slice(-1) == 'B'){
+											zuih = 'D'
+										}else if(that.deviceId.slice(-1) == 'C'){
+											zuih = 'E'
+										}else if(that.deviceId.slice(-1) == 'D'){
+											zuih = 'F'
+										}else{
+											zuih = Number(that.deviceId.slice(-1)) + 2
+										}
+										that.deviceId = that.deviceId.slice(0, -1) + zuih
+										console.log(that.modelId,zuih,that.deviceId.slice(0, -1),'...........')
+										xBlufi.notifyStartDiscoverBle({
+											'isStart': false 
+										})
+										console.log("进入蓝牙连接", that.deviceId)
+										console.log("进入that.name", that.name)
+										xBlufi.notifyConnectBle({
+											isStart: true,
+											deviceId: that.deviceId,
+											name: that.name
+										})
+									}else{
+										console.log('无配网')
+										xBlufi.notifyStartDiscoverBle({
+											'isStart': false
+										})
+										console.log("进入蓝牙连接", that.deviceId)
+										console.log("进入that.name", that.name)
+										xBlufi.notifyConnectBle({
+											isStart: true,
+											deviceId: that.deviceId,
+											name: that.name
+										})
+									}
+								})
+							} else if (systemInfo.platform == 'ios') {
+								// 当前设备是 iOS  
+								that.findDevice()
+						  }
+					}
+				}
+            },
+			findDevice() {
+				// 使用 find 方法查找匹配的设备
+				const matchedDevice = this.devicesarr.find(device => {
+				    console.log(device.name, this.qrResult, '111') 
+				    console.log("IOSMAC", device)
+				    return device.name.slice(-12) == this.qrResult.slice(-12)
+				})
+				if (matchedDevice) {
+				    // 找到匹配的设备
+				    xBlufi.notifyStartDiscoverBle({
+				        'isStart': false
+				    })
+				    xBlufi.notifyConnectBle({
+				        isStart: true,
+				        deviceId: matchedDevice.deviceId,
+				        name: matchedDevice.name
+				    })
+				    this.deviceId = matchedDevice.deviceId
+				    this.name = matchedDevice.name
+				    console.log(this.deviceId, '11221')
+				} else {
+				    console.log("未找到匹配的设备，继续查找...")
+				    setTimeout(this.findDevice.bind(this), 1000) // 使用 bind 保持 this 上下文
+				}
+			},
+			// 获取设备详情
+			getDevice(id) {
+				this.$u.get("/app/device/" + id).then((res) => {
+					if (res.code == 200) {
+						if(res.data.wxs != null){
+							this.wxs = (res.data.wxs * 100).toFixed(2) + '%'
+						}else{
+							this.wxs = 100 + '%'
+						}
+						this.deviceInfo = res.data
+						this.qrResult = res.data.mac
+						this.modelId = res.data.modelTags
+						this.deviceId = res.data.mac.match(/.{2}/g).reverse().join(':')
+						console.log(this.deviceId,'02022')
+						if (this.ver_dataflag != 3) { //判断离线默认连蓝牙
+							this.getlanya()
+						}
+						this.storeId = res.data.storeId
+						this.deviceNo = res.data.deviceNo
+						this.getshoukuan()
+						if (res.data.customPicture != null) {
+							this.imglist = res.data.customPicture
+						} else {
+							this.imglist = res.data.picture
+						}
+						if (this.deviceInfo.expireTime == null) {
+							this.timeday = 0
+						} else {
+							let expireTimeStr = this.deviceInfo.expireTime
+							let expireTimeParts = expireTimeStr.split(" ")
+							let expireDateParts = expireTimeParts[0].split("-")
+							let expireTimePartsTime = expireTimeParts[1].split(":")
+							let expireDate = new Date(expireDateParts[0], expireDateParts[1] - 1, expireDateParts[2], expireTimePartsTime[0], expireTimePartsTime[1], expireTimePartsTime[2])
+							let now = new Date()
+							let differenceInMs = expireDate - now
+							if (differenceInMs <= 0) {
+								this.timeday = 0
+							} else {
+								clearInterval(this.timer)
+								this.timer = null
+								this.timeday = this.formatMilliseconds(differenceInMs)
+								this.startTimer()
+							}
+						}
+						if (res.data.powerStatus == 0) {
+							this.imgflag = false
+							this.tdtxt = '关闭'
+						} else {
+							this.imgflag = true
+							this.tdtxt = '开启'
+						}
+						this.loadings = true
+					}
+				})
+			},
+			startTimer() {
+				this.timer = setInterval(() => {
+					if (this.timeday.seconds > 0) {
+						this.timeday.seconds--
+					} else if (this.timeday.minutes > 0) {
+						this.timeday.seconds = 59 // 重置秒数为59  
+						this.timeday.minutes--
+					} else if (this.timeday.hours > 0) {
+						this.timeday.minutes = 59 // 重置分钟数为59  
+						this.timeday.hours--
+						this.timeday.seconds = 0 // 同时重置秒数为0  
+					} else if (this.timeday.days > 0) {
+						this.timeday.hours = 23 // 重置小时数为23  
+						this.timeday.minutes = 59 // 重置分钟数为59  
+						this.timeday.seconds = 0 // 重置秒数为0  
+						this.timeday.days--
+					} else {
+						// 所有时间单位都已减为0，停止定时器  
+						clearInterval(this.timer)
+						this.timer = null
+						// console.log('时间已到期') 
+					}
+				}, 1000) // 每秒执行一次  
+			},
+			// 计算天时分秒
+			formatMilliseconds(milliseconds) {
+				// 计算天数  
+				let days = Math.floor(milliseconds / (1000 * 60 * 60 * 24))
+				// 计算剩余的小时数  
+				let hours = Math.floor((milliseconds % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60))
+				// 计算剩余的分钟数  
+				let minutes = Math.floor((milliseconds % (1000 * 60 * 60)) / (1000 * 60))
+				// 计算剩余的秒数  
+				let seconds = Math.floor((milliseconds % (1000 * 60)) / 1000)
+				// 返回一个对象，包含天、小时、分钟和秒  
+				return {
+					days: days,
+					hours: hours,
+					minutes: minutes,
+					seconds: seconds
+				}
+			},
+			// 其他部分 点击进行跳转
+			topage(num) {
+				this.btnmsk = true
+				if (num == 0) {
+					this.btnmsk = false
+					uni.navigateTo({ //抄表
+						url: '/page_user/cbRecord?id=' + this.id
+					})
+				} else if (num == 1) {
+					if (this.deviceInfo.onlineStatus == 1) {
+						let that = this
+						uni.showModal({
+							title: '提示',
+							content: '您确定要将设备时间归零吗？',
+							success: function(res) {
+								if (res.confirm) {
+									that.btnmsk = false
+									//归零
+									that.$u.put(`/app/device/${that.id}/reset`).then((res) => {
+										if (res.code == 200) {
+											uni.showToast({
+												title: res.msg,
+												icon: 'success',
+												duration: 2000
+											})
+											that.getDevice(that.id)
+											setTimeout(()=>{
+												that.deviceInfo.status = 1
+												that.imgflag = false
+												that.tdtxt = '关闭'
+											},1000)
+										} else if (res.code == 500) {
+											uni.showToast({
+												title: res.msg,
+												icon: 'none',
+												duration: 2000
+											})
+										}
+									})
+								} else if (res.cancel) {
+									that.btnmsk = false
+									console.log('用户点击了取消')
+								}
+							}
+						})
+					}else{
+						this.btnmsk = false
+						if (this.ver_dataflag != 3) {
+							uni.showModal({
+								title: '温馨提示',
+								content: '蓝牙连接中，请尽量靠近设备！',
+								showCancel: false,
+								success: function(res) {
+									
+								}
+							})
+						} else {
+							let that = this
+							uni.showModal({
+								title: '提示',
+								content: '您确定要将设备时间归零吗？',
+								success: function(res) {
+									if (res.confirm) {
+										that.btnmsk = false
+										setTimeout(() => {
+										    that.deviceInfo.status = 1
+										    that.imgflag = false
+										    that.tdtxt = '关闭'
+										    that.timeday = 0
+										    xBlufi.notifySendCustomData({
+										    		customData: 'time0@'
+										    	})
+										    xBlufi.notifySendCustomData({
+										    		customData: 'mmney0@'
+										    	})
+										    xBlufi.notifySendCustomData({
+										    		customData: '11time0@'
+										    	})
+										    xBlufi.notifySendCustomData({
+										    		customData: '11mmney0@'
+										    	})
+										    let data = {
+										    	mac:that.qrResult,
+										    	reason:'归零',
+										    	command:'@time0@mmney0close',
+										    	result:'成功'
+										    }
+										    that.$u.post(`/app/commandLog/bluetooth`,data).then(res => {})
+										    uni.showToast({
+										    	title: '归零成功',
+										    	icon: 'success',
+										    	duration: 2000
+										    })
+										}, 1000)
+									}
+								}
+							})
+						}
+					}
+				} else if (num == 2) { //异常
+					this.btnmsk = false
+					uni.navigateTo({
+						url: '/page_fenbao/statulist/fault/yichang/index'
+					})
+				} else if (num == 3) {
+					this.btnmsk = false
+					uni.navigateTo({
+						url: "/page_fenbao/statulist/taocanlist/index?id=" + this.id + '&modevalue=' + 1
+					})
+				} else if (num == 4) { //固件升级
+					this.btnmsk = false
+					if(this.ver_dataflag != 3){
+						uni.showToast({
+							title: '请在蓝牙连接的情况下进行',
+							icon: 'none',
+							duration: 2000
+						})
+					}else{
+						console.log(11);
+					}
+					// uni.navigateTo({
+					// 	url: '/page_user/setting?id=' + this.id
+					// })
+				} else if (num == 5) {
+					this.btnmsk = false
+					let that = this
+					uni.openBluetoothAdapter({
+					  success: function (res) {
+						  uni.getLocation({
+						  	type: 'wgs84',
+						  	success: (res) => { 
+						  		if(that.deviceInfo.wifi == null){
+						  			let systemInfo = uni.getSystemInfoSync()
+						  			if (systemInfo.platform == 'android') {
+										xBlufi.notifyStartDiscoverBle({
+											'isStart': false
+										})
+										xBlufi.notifyConnectBle({
+											isStart: false,
+											deviceId: that.deviceId,
+											name: that.name
+										})	
+						  				// 当前设备是 Android  
+						  				setTimeout(()=>{
+											uni.navigateTo({
+												url: '/page_components/wifilist/index?deviceId=' + that.qrResult + '&name=' + that.name + '&wifi=' + '暂无配网' + '&id=' + that.id
+											})
+										},500)
+						  			} else if (systemInfo.platform == 'ios') {
+										xBlufi.notifyStartDiscoverBle({
+											'isStart': false
+										})
+										xBlufi.notifyConnectBle({
+											isStart: false,
+											deviceId: that.deviceId,
+											name: that.name
+										})	
+						  				// 当前设备是 iOS  
+										setTimeout(()=>{
+											uni.navigateTo({
+												url: '/page_fenbao/device/wifivideo?deviceId=' + that.qrResult + '&name=' + that.name + '&wifi=' + '暂无配网' + '&id=' + that.id
+											})
+										},500)
+						  			}else{ 
+						  				uni.showToast({
+						  					title: '目前仅支持安卓和iOS系统',
+						  					icon: 'none',
+						  					duration: 2000
+						  				})
+						  			}
+						  		}else{
+						  			let systemInfo = uni.getSystemInfoSync()
+						  			if (systemInfo.platform == 'android') {
+						  				// 当前设备是 Android  
+						  				uni.navigateTo({
+						  					url: '/page_components/wifilist/index?deviceId=' + that.qrResult + '&name=' + that.name + '&wifi=' + that.deviceInfo.wifi  + '&id=' + that.id
+						  				})
+						  			} else if (systemInfo.platform == 'ios') {
+						  				// 当前设备是 iOS  
+						  				uni.navigateTo({
+						  					url: '/page_fenbao/device/wifivideo?deviceId=' + that.qrResult + '&name=' + that.name + '&wifi=' + that.deviceInfo.wifi  + '&id=' + that.id
+						  				})
+						  			}else{ 
+						  				uni.showToast({
+						  					title: '目前仅支持安卓和iOS系统',
+						  					icon: 'none',
+						  					duration: 2000
+						  				})
+						  			}
+						  		}
+						  	},
+						  	fail: (err) => {
+						  		console.error('获取位置失败：', err)
+								uni.showToast({
+								  title: '位置信息未打开，无法配网，请授权后重试',
+								  icon: 'none',
+								  duration:2000
+								})
+						  	}
+						  })
+					  },
+					  fail: function (err) {
+					    console.error('蓝牙适配器初始化失败', err)
+					    // 蓝牙未打开或初始化失败
+					    uni.showToast({
+					      title: '手机蓝牙未打开',
+					      icon: 'none'
+					    })
+					  }
+					})
+				} else if (num == 6) {
+					uni.pageScrollTo({
+					        scrollTop: 0,//滚动到距离顶部为0
+					        duration: 0//滚动时长
+					    })
+					this.btnmsk = false
+					this.vipflag = true
+					this.focus = true
+				}
+			},
+			getaddtime() {
+				this.$u.put('/app/device/addTime/' + this.id + '?amount=' + this.cztime + '&timeUnit=' + this.damweiid +'&withIot=false').then(res => {})
+			},
+			trueje() {
+				if (this.timer) {
+					clearInterval(this.timer)
+					this.timer = null
+				}
+				let id = this.deviceInfo.deviceId
+				this.vipflag = false
+				if (this.deviceInfo.onlineStatus == 1) {
+					this.$u.put('/app/device/addTime/' + id + '?amount=' + this.cztime + '&timeUnit=' + this.damweiid)
+						.then(res => {
+							if (res.code == 200) {
+								uni.showToast({
+									title: '充值成功',
+									icon: 'success',
+									duration: 2000
+								})
+								setTimeout(() => {
+									this.getshuax()
+									this.cztime = ''
+									this.danwei = ''
+									this.deviceInfo.status = 2
+									this.tdtxt = '开启'
+									this.imgflag = true
+								}, 2000)
+							} else if (res.code == 500) {
+								uni.showToast({
+									title: res.msg,
+									icon: 'none',
+									duration: 2000
+								})
+							}
+						})
+				} else {
+					if (this.ver_dataflag != 3) {
+						uni.showModal({
+							title: '温馨提示',
+							content: '蓝牙连接中，请尽量靠近设备！',
+							showCancel: false,
+							success: function(res) {
+								
+							}
+						})
+					} else {
+						let that = this
+						uni.getNetworkType({
+							success(res) {
+								if (res.networkType !== 'none') {
+									uni.getConnectedBluetoothDevices({
+										success(res) {
+											setTimeout(() => {
+												that.deviceInfo.status = 2
+												that.imgflag = true
+												that.tdtxt = '开启'
+												if (that.damweiid == 0) {
+													xBlufi.notifySendCustomData({
+														customData: 'mmney' + that.cztime + '@'
+													})
+													xBlufi.notifySendCustomData({
+														customData: '11mmney' + that.cztime + '@'
+													})
+													that.getaddtime()
+												} else if (that.damweiid == 4) {
+													xBlufi.notifySendCustomData({
+														customData: 'time' + that.cztime + '@'
+													})
+													xBlufi.notifySendCustomData({
+														customData: '11time' + that.cztime + '@'
+													})
+													that.getaddtime()
+												} else if (that.damweiid == 3) {
+													xBlufi.notifySendCustomData({
+														customData: 'time' + that.cztime * 60 + '@'
+													})
+													xBlufi.notifySendCustomData({
+														customData: '11time' + that.cztime * 60 + '@'
+													})
+													that.getaddtime()
+												} else if (that.damweiid == 2) {
+													xBlufi.notifySendCustomData({
+														customData: 'time' + that.cztime * 60 * 60 + '@'
+													})
+													xBlufi.notifySendCustomData({
+														customData: '11time' + that.cztime * 60 * 60 + '@'
+													})
+													that.getaddtime()
+												}
+												let data = {
+													mac:that.qrResult,
+													reason:'增加时长',
+													command:'11time@',
+													result:'成功'
+												}
+												console.log(data,'111');
+												that.$u.post(`/app/commandLog/bluetooth`,data).then(res => {})
+											}, 1000)
+										},
+										fail(err) {
+											console.error('获取已连接蓝牙设备信息失败：', err)
+										}
+									})
+								}
+							}
+						})
+					}
+				}
+			},
+			btnqx() {
+				this.vipflag = false
+				this.cztime = ''
+			},
+			funListenDeviceMsgEvent: function(options) {
+				let that = this;
+				switch (options.type) {
+					case xBlufi.XBLUFI_TYPE.TYPE_STATUS_CONNECTED:
+						if (!options.result) {
+							that.ver_dataflag = 1
+						}
+						break;
+					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS:
+						if (options.result) {
+							this.devicesarr = options.data
+						}
+						break
+					case xBlufi.XBLUFI_TYPE.TYPE_CONNECTED:
+						console.log("连接回调：" + JSON.stringify(options))
+						if (options.result == true) {
+							setTimeout(()=>{
+								this.ver_dataflag = 3
+							},2000)
+							xBlufi.notifyInitBleEsp32({
+								deviceId: options.data.deviceId
+							})
+						}else{
+							
+						}
+						break
+					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_MY_DATA:
+						console.log("文件读取中", options.data)
+						break
+					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
+						this.ver_dataflag = 3
+						console.log("1收到设备发来的自定义数据结果：", options.data)
+						break
+					case xBlufi.XBLUFI_TYPE.TYPE_INIT_ESP32_RESULT:
+						if (options.result) {
+							console.log('初始化成功')
+						} else {
+							console.log('初始化失败')
+							break
+						}
+						break
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.pagesac{
+		top: 0 !important;
+	}
+	/deep/ .panel {
+		position: fixed;
+		width: 100%;
+		height: 100%;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		z-index: 99 !important;
+		overflow: hidden;
+	}
+
+	.imgewmflag {
+		width: 750rpx;
+		height: 100vh;
+		background: #fff;
+		border-radius: 0rpx 0rpx 0rpx 0rpx;
+		z-index: 1;
+		position: fixed;
+		top: 0;
+		left: 0;
+	}
+
+	.imgewm {
+		width: 250px;
+		height:250px;
+		position: fixed;
+		top:400rpx;
+		left: 50%;
+		transform: translateX(-50%);
+		z-index: 2;
+	}
+
+	.lanyalx {
+		display: inline-block;
+		text-align: center;
+		font-size: 26rpx;
+		width: 196rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+		background-color: #8883F0;
+		color: #fff;
+		position: absolute;
+		bottom: 0;
+		border-radius: 0 0 10rpx 10rpx;
+	}
+
+	.conts {
+		display: flex;
+		justify-content: space-between;
+		margin-top: 50rpx;
+		align-items: center;
+		width: 100%;
+		height: 100%;
+		padding: 20rpx;
+		border-radius: 30rpx;
+		box-sizing: border-box;
+		background-color: #fff;
+
+		.bot {
+			// width: 100%;
+			// height: 80rpx;
+			// line-height: 80rpx;
+			// text-align: center;
+			// border-radius: 30rpx;
+			// background-color: #fff;
+			// margin-top: 30rpx;
+			font-size: 30rpx;
+		}
+	}
+
+	.picjt {
+		position: fixed;
+		top: 190rpx;
+		right: 60rpx;
+		width: 16rpx;
+		height: 30rpx;
+	}
+
+	.bluetoothbox {
+		width: 100%;
+		height: 100vh;
+		background-color: #f4f1f6;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 99;
+		text-align: center;
+
+		.img {
+			margin-top: 400rpx;
+			width: 320rpx;
+			height: 320rpx;
+		}
+
+		.one {
+			font-size: 36rpx;
+			color: #000;
+		}
+
+		.two {
+			margin-top: 30rpx;
+			font-size: 24rpx;
+			color: #ccc;
+		}
+
+		.thr {
+			margin-top: 30rpx;
+			font-size: 28rpx;
+			color: #ccc;
+		}
+
+		.anfour {
+			display: flex;
+			margin-top: 30rpx;
+			justify-content: space-between;
+			padding: 0 220rpx;
+			box-sizing: border-box;
+
+			.qx {
+				width: 100rpx;
+				height: 70rpx;
+				line-height: 70rpx;
+				text-align: center;
+				border: 1px solid #3D3D3D;
+				border-radius: 10rpx;
+			}
+
+			.cx {
+				width: 200rpx;
+				height: 70rpx;
+				line-height: 70rpx;
+				text-align: center;
+				background-color: #8883F0;
+				color: #fff;
+				border-radius: 10rpx;
+			}
+		}
+
+		.stop {
+			font-size: 36rpx;
+			color: #000;
+			margin-top: 380rpx;
+		}
+
+		.xtop {
+			margin-top: 30rpx;
+			font-size: 24rpx;
+			color: #ccc;
+		}
+
+		.xqx {
+			width: 530rpx;
+			height: 90rpx;
+			line-height: 90rpx;
+			border-radius: 20rpx;
+			text-align: center;
+			background-color: #fff;
+			margin: auto;
+			margin-top: 200rpx;
+		}
+
+		image {
+			width: 500rpx;
+			height: 500rpx;
+			margin-top: 100rpx;
+		}
+	}
+    .popcard {
+    	display: flex;
+    	justify-content: center;
+    	flex-wrap: wrap;
+    	width: 550rpx;
+    	height: 400rpx;
+    	border-radius: 20rpx;
+    
+    	.tit {
+    		display: flex;
+    		justify-content: center;
+    		width: 100%;
+    		align-items: center;
+    		font-size: 28rpx;
+    		font-weight: 700;
+    	}
+    
+    	.ipt {
+    		margin-top: 60rpx;
+    		width: 80%;
+    
+    		.u-input::placeholder {
+    			font-size: 20px;
+    			color: red;
+    		}
+    	}
+    
+    	.btnbox {
+    		width: 100%;
+    		display: flex;
+    		flex-wrap: nowrap;
+    		border-radius: 0 0 20rpx 20rpx;
+    
+    		.btn2 {
+    			display: flex;
+    			align-items: center;
+    			justify-content: center;
+    			width: 50%;
+    			font-size: 32rpx;
+    			font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+    			font-weight: 400;
+    			color: #000;
+    			background-color: #fff;
+    		}
+    
+    		.btn1 {
+    			display: flex;
+    			align-items: center;
+    			justify-content: center;
+    			width: 50%;
+    			font-size: 32rpx;
+    			font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+    			font-weight: 400;
+    			color: #fff;
+    			background-color: #8883f0;
+    			border: 1rpx solid #ccc;
+    		}
+    	}
+    
+    }
+	/deep/ .u-title {
+		padding-bottom: 22rpx;
+	}
+
+	/deep/ .uicon-nav-back {
+		padding-bottom: 22rpx;
+	}
+
+	page {
+		background-color: #F9F8FF;
+	}
+	.dianliang{
+		position: fixed;
+		top: 30%;
+		left: 50%;
+		transform: translateX(-50%);
+		z-index: 3;
+		width: 680rpx;
+		height: 733rpx;
+		.anniu{
+			width: 636rpx;
+			height: 114rpx;
+			line-height: 114rpx;
+			text-align: center;
+			font-weight: 600;
+			font-size: 40rpx;
+			color: #FFFFFF;
+			background: #8883F0;
+			border-radius: 18rpx 18rpx 18rpx 18rpx;
+			position: absolute;
+			top: 570rpx;
+			left: 50%;
+			transform:translateX(-50%);
+			z-index: 2;
+		}
+		.shuru{
+			position: absolute;
+			top: 400rpx;
+			left: 50%;
+			transform:translateX(-50%);
+			z-index: 2;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			input{
+				width: 386rpx;
+				height: 88rpx;
+				border-radius: 15rpx 15rpx 15rpx 15rpx;
+				border: 1rpx solid #808080;
+				text-align: center;
+				line-height: 88rpx;
+				margin: 0 27rpx;
+			}
+			image{
+				width: 88rpx;
+				height: 88rpx;
+			}
+		}
+		.bj{
+			position: absolute;
+			top: 0;
+			left: 0;
+			z-index: 2;
+		}
+	}
+    .mask {
+    	width: 750rpx;
+    	height: 100vh;
+    	background: #000000;
+    	border-radius: 0rpx 0rpx 0rpx 0rpx;
+    	opacity: 0.2;
+    	z-index: 1;
+    	position: fixed;
+    	top: 0;
+    	left: 0;
+    }
+	.maskss {
+		width: 750rpx;
+		height: 100vh;
+		background: #000000;
+		border-radius: 0rpx 0rpx 0rpx 0rpx;
+		opacity: 0.2;
+		z-index: 1;
+		position: fixed;
+		top: 0;
+		left: 0;
+	}
+
+	.tanc {
+		width: 610rpx;
+		max-height: 430rpx;
+		background: #FFFFFF;
+		border-radius: 30rpx 30rpx 30rpx 30rpx;
+		position: fixed;
+		top: 528rpx;
+		left: 50%;
+		transform: translateX(-50%);
+		z-index: 2;
+        text-align: center;
+		.tit {
+			width: 100%;
+			text-align: center;
+			margin-top: 28rpx;
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #3D3D3D;
+		}
+
+		input {
+			width: 504rpx;
+			height: 90rpx;
+			background: #EEEEEE;
+			border-radius: 6rpx 6rpx 6rpx 6rpx;
+			margin: auto;
+			margin-top: 22rpx;
+			padding-left: 20rpx;
+			text-align: left;
+		}
+        .inpss{
+			width: 510rpx;
+			height: 90rpx;
+			line-height: 90rpx;
+			font-size: 32rpx;
+			color: #ccc;
+			background: #EEEEEE;
+			border-radius: 6rpx 6rpx 6rpx 6rpx;
+			margin: auto;
+			margin-top: 22rpx;
+			padding-left: 20rpx;
+			text-align: left;
+		}
+		.xian {
+			width: 610rpx;
+			height: 2rpx;
+			background: #eee;
+			border-radius: 0rpx 0rpx 0rpx 0rpx;
+			margin-top: 26rpx;
+		}
+
+		.anniu {
+			display: flex;
+			justify-content: space-between;
+			height: 98rpx;
+
+			text {
+				padding: 24rpx;
+				text-align: center;
+				box-sizing: border-box;
+				font-weight: 500;
+				font-size: 36rpx;
+				color: #3D3D3D;
+				display: inline-block;
+				width: 100%;
+				height: 100rpx;
+			}
+		}
+	}
+
+	.txt {
+		text-align: left;
+		font-size: 28rpx;
+		color: #808080;
+		font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+		font-weight: 400;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.page {
+		// width: 100%;
+		// height: 100vh;
+		// overflow: scroll;
+  //       padding-bottom: 80rpx;
+		// box-sizing: border-box;
+		.zhuhu {
+			margin-top: 46rpx;
+			padding: 0 40rpx;
+            padding-bottom: 80rpx;
+			.card1 {
+				// padding: 34rpx 0 0 40rpx;
+				width: 670rpx;
+				// height: 320rpx;
+
+				.top {
+					display: flex;
+					flex-wrap: nowrap;
+					justify-content: space-between;
+					align-items: center;
+
+					.left {
+						font-size: 35rpx;
+						font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+						font-weight: 400;
+						color: #8883F0;
+					}
+
+					.right {
+						margin-right: 56rpx;
+
+						.img1 {
+							width: 76rpx;
+							height: 76rpx;
+						}
+					}
+				}
+
+				.mid {
+					margin-top: 20rpx;
+					display: flex;
+					flex-wrap: nowrap;
+					align-content: flex-start;
+					justify-content: space-between;
+
+					.mid_left {
+						border-radius: 20rpx;
+						border: 1px solid #ff;
+						image {
+							width: 160rpx;
+							height: 160rpx;
+							border-radius: 20rpx;
+						}
+					}
+
+					.mid_right {
+						margin-left: 20rpx;
+						display: flex;
+						flex-wrap: wrap;
+
+						.mid_top {
+							width: 100%;
+							font-size: 36rpx;
+							font-weight: 600;
+							color: #333;
+							display: flex;
+							align-items: center;
+							padding-right: 4rpx;
+							box-sizing: border-box;
+							text{
+								margin-left: 10rpx;
+								font-weight: 400;
+								font-size: 24rpx;
+								padding: 6rpx;
+								box-sizing: border-box;
+							}
+						}
+
+						.mid_bot {
+							width: 100%;
+							display: flex;
+							// padding-right: 102rpx;
+							box-sizing: border-box;
+							margin-top: 10rpx;
+							.tip {
+								box-sizing: border-box;
+								background: rgba(204, 204, 204, 0);
+								opacity: 1;
+								font-size: 28rpx;
+								font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+								font-weight: 400;
+								color: #5B5B5B;
+								margin-right: 16rpx;
+							}
+						}
+					}
+				}
+
+				.bot {
+					margin-top: 20rpx;
+					display: flex;
+					flex-wrap: nowrap;
+					align-items: center;
+
+					.bot_left {
+						width: 210rpx;
+						height: 180rpx;
+						margin-right: 34rpx;
+
+						.echarts {
+							height: 200rpx;
+
+							.uni-ec-canvas {
+								width: 100%;
+								height: 100rpx !important;
+								display: block;
+							}
+						}
+					}
+
+					.bot_right {
+						display: flex;
+						width: 100%;
+						justify-content: space-between;
+						padding-left: 80rpx;
+						padding-right: 80rpx;
+						box-sizing: border-box;
+
+						.cont {
+							.tit {
+								font-size: 28rpx;
+								font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+								font-weight: 600;
+								color: #262B37;
+								line-height: 49rpx;
+							}
+
+							.txt {
+								font-size: 26rpx;
+								font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+								font-weight: 400;
+								color: #262B37;
+							}
+						}
+					}
+				}
+			}
+
+			.bot_right {
+				display: flex;
+				width: 100%;
+				justify-content: space-between;
+				padding-left: 60rpx;
+				padding-right: 60rpx;
+				box-sizing: border-box;
+				margin-top: 30rpx;
+
+				.cont {
+					.tit {
+						font-size: 32rpx;
+						font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+						font-weight: 600;
+						color: #262B37;
+						line-height: 49rpx;
+						margin-left: 0;
+					}
+
+					.txt {
+						font-size: 32rpx;
+						font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+						font-weight: 400;
+						color: #262B37;
+					}
+				}
+			}
+
+			.card2 {
+				padding-top: 40rpx;
+				margin-top: 20rpx;
+				width: 670rpx;
+				max-height: 614rpx;
+				padding-bottom: 30rpx;
+				background: #FFFFFF;
+				box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(53, 140, 255, 0.1);
+				border-radius: 28rpx;
+                .aa{
+					padding-left: 40rpx;
+					padding-right: 40rpx;
+					box-sizing: border-box;
+					display: flex;
+					justify-content: space-between;
+					margin-top: 10rpx;
+					font-size: 28rpx;
+					color: #808080;
+				}
+				.tit {
+					margin-left: 40rpx;
+					font-size: 36rpx;
+					color: #3D3D3D;
+					font-weight: 600;
+				}
+			}
+
+			.card3 {
+				padding-top: 40rpx;
+				margin-top: 24rpx;
+				width: 670rpx;
+				// height: 490rpx;
+				// overflow: scroll;
+				background: #FFFFFF;
+				box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(53, 140, 255, 0.1);
+				border-radius: 28rpx;
+				.tit {
+					margin-left: 40rpx;
+
+					font-size: 35rpx;
+					font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+					font-weight: 400;
+					color: #3D3D3D;
+				}
+
+				.cont_box {
+					padding: 0 40rpx;
+					display: flex;
+					padding-bottom: 40rpx;
+					box-sizing: border-box;
+					flex-wrap: wrap;
+					align-items: center;
+					.cont:last-child {
+						margin-right: 0rpx;
+					}
+					.cont {
+						width: 25%;
+						text-align: center;
+						margin-top: 58rpx;
+						.top {
+							width: 100%;
+							image {
+								width: 58rpx !important;
+								height: 58rpx !important;
+							}
+							.bot {
+								font-weight: 400;
+								font-size: 32rpx;
+								color: #3D3D3D;
+								margin-top: 24rpx;
+							}
+						}
+					}
+				}
+			}
+
+			.button {
+				margin-left: 76rpx;
+				margin-top: 178rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 520rpx;
+				height: 104rpx;
+				background: #8883F0;
+				box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1);
+				border-radius: 52rpx 52rpx 52rpx 52rpx;
+				font-size: 32rpx;
+				font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+				font-weight: 400;
+				color: #FFFFFF;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/page_fenbao/sbshouye.vue b/page_fenbao/sbshouye.vue
index 9aaca6b..dc75652 100644
--- a/page_fenbao/sbshouye.vue
+++ b/page_fenbao/sbshouye.vue
@@ -18,7 +18,7 @@
 												src="https://api.ccttiot.com/smartmeter/img/static/uZSiz7XWpxcXEkl6sTwj"
 												mode="aspectFit"></image>
 											<view class="sta_txt" v-if="item.status==3">
-												维修中
+												调试中
 											</view>
 											<view class="sta_txt" v-if="item.status==2" style="color:greenyellow;">
 												使用中
diff --git a/page_fenbao/statulist/myshop/editshop/index.vue b/page_fenbao/statulist/myshop/editshop/index.vue
index c9c284b..76265de 100644
--- a/page_fenbao/statulist/myshop/editshop/index.vue
+++ b/page_fenbao/statulist/myshop/editshop/index.vue
@@ -112,6 +112,10 @@
 					<view class="tit"> 是否允许在非营业时间使用</view>
 					 <u-switch v-model="checkeds" active-color="#8883F0"></u-switch> 
 				</view>
+				<view class="listval">
+					<view class="tit"> 店铺描述</view>
+					<view class="but"> <input type="text" v-model="miaoshu" placeholder="请输入您的店铺描述"/> </view>
+				</view>
 				<view class="baocun" @click="btncreat">
 					提交修改
 				</view>
@@ -152,27 +156,7 @@
 				regionshow: false,
 				regiontext: '请选择省市区',
 				regionvalue: '',
-				selector: [{
-						value: 1,
-						label: '商场'
-					},
-					{
-						value: 2,
-						label: '学校'
-					},
-					{
-						value: 3,
-						label: '娱乐场所'
-					},
-					{
-						value: 4,
-						label: '出租房'
-					},
-					{
-						value: 5,
-						label: '其他'
-					},
-				],
+				selector: [],
 				latitude: '请输入纬度',
 				longitude: '请输入经度',
 				shopname: '',
@@ -189,14 +173,18 @@
 				listobj: {},
 				storeId: '',
 				url:'',
-				jtdz:''
+				jtdz:'',
+				miaoshu:'',
+				leixinglist:[]
 			}
 		},
 		onLoad(option) {
+			this.getleixing()
 			let obj = JSON.parse(option.obj)
 			this.listobj = obj
 			console.log(this.listobj);
 			this.shopname = this.listobj.name
+			this.miaoshu = this.listobj.description
 			this.ksyy = this.listobj.businessTimeStart
 			this.jsyy = this.listobj.businessTimeEnd
 			this.regiontext = this.listobj.province + this.listobj.city + this.listobj.county
@@ -205,7 +193,7 @@
 			this.latitude = this.listobj.lat
 			this.longitude = this.listobj.lng
 			this.xqdz = this.listobj.address
-			this.selectorvalue = this.listobj.type
+			this.selectorvalue = this.listobj.typeId
 			this.imglist = this.listobj.picture.split(',')
 			this.province = this.listobj.province
 			this.city = this.listobj.city
@@ -213,18 +201,18 @@
 			this.storeId = this.listobj.storeId
 			this.checked = this.listobj.show
 			this.checkeds = this.listobj.useOutTime
-			if (this.selectorvalue == 1) {
-				this.selectortext = '商场'
-				this.updateTime = this.listobj.updateTime
-			} else if (this.selectorvalue == 2) {
-				this.selectortext = '学校'
-			} else if (this.selectorvalue == 3) {
-				this.selectortext = '娱乐场所'
-			} else if (this.selectorvalue == 4) {
-				this.selectortext = '出租房'
-			} else {
-				this.selectortext = '其他'
-			}
+			// if (this.selectorvalue == 1) {
+			// 	this.selectortext = '商场'
+			// 	this.updateTime = this.listobj.updateTime
+			// } else if (this.selectorvalue == 2) {
+			// 	this.selectortext = '学校'
+			// } else if (this.selectorvalue == 3) {
+			// 	this.selectortext = '娱乐场所'
+			// } else if (this.selectorvalue == 4) {
+			// 	this.selectortext = '出租房'
+			// } else {
+			// 	this.selectortext = '其他'
+			// }
 			this.getQiniuToken()
 		},
 		// 分享到好友（会话）
@@ -244,6 +232,21 @@
 		    }  
 		  },
 		methods: {
+			getleixing() {
+			    this.$u.get("/app/storeType/listAll").then(res => {
+			        this.leixinglist = res.data.map(item => ({
+			            value: item.id,
+			            label: item.name
+			        }))
+					this.selector = this.leixinglist
+					// console.log(this.listobj.typeId,this.leixinglist);
+					this.leixinglist.forEach(item =>{
+						if(item.value == this.selectorvalue){
+							this.selectortext = item.label
+						}
+					})
+			    })
+			},
 			handleLongPress(index) {
 				let that = this
 				uni.showModal({
@@ -382,10 +385,11 @@
 						specificAddress: this.jtdz,
 						contactName: this.lxname,
 						contactMobile: this.lxphone,
-						type: this.selectorvalue,
+						typeId: this.selectorvalue,
 						storeId: this.storeId,
 						show:this.checked,
-						useOutTime:this.checkeds
+						useOutTime:this.checkeds,
+						description:this.miaoshu
 					}
 					this.$u.put("/app/store", data).then(res => {
 						if (res.code == 500) {
@@ -434,7 +438,7 @@
 						this.latitude = res.latitude;
 						this.longitude = res.longitude;
 						this.xqdz = res.name
-						this.jtdz = res.address
+						this.jtdz = res.name
 					},
 					fail: function(err) {
 						console.log('选择位置失败', err);
diff --git a/page_fenbao/statulist/myshop/shebeilist/index.vue b/page_fenbao/statulist/myshop/shebeilist/index.vue
index b1a7a7c..deae15b 100644
--- a/page_fenbao/statulist/myshop/shebeilist/index.vue
+++ b/page_fenbao/statulist/myshop/shebeilist/index.vue
@@ -18,7 +18,7 @@
 												src="https://api.ccttiot.com/smartmeter/img/static/uZSiz7XWpxcXEkl6sTwj"
 												mode="aspectFit"></image>
 											<view class="sta_txt" v-if="item.status==3">
-												维修中
+												调试中
 											</view>
 											<view class="sta_txt" v-if="item.status==2" style="color:greenyellow;">
 												使用中
diff --git a/page_fenbao/statulist/myshop/shopxx/index.vue b/page_fenbao/statulist/myshop/shopxx/index.vue
index 5ae0053..c8ecfdf 100644
--- a/page_fenbao/statulist/myshop/shopxx/index.vue
+++ b/page_fenbao/statulist/myshop/shopxx/index.vue
@@ -52,24 +52,18 @@
 					<view class="tit"> 店铺名称</view>
 					<view class="but"> <input type="text" placeholder="请输入店铺名称" v-model="shopname" /> </view>
 				</view>
+				
 				<view class="listvals" @click="btnlx">
 					<view class="tit"> 店铺类型</view>
-					<!-- #ifdef MP-ALIPAY -->
-					<view style="line-height: 70rpx;padding-left: 40rpx;width: 462rpx;
-					height: 70rpx;
-					background: #F0F0F0;
-					border-radius: 12rpx 12rpx 12rpx 12rpx;" @click="btnlx">
-						<text style="color: #ccc;font-size: 32rpx;">{{selectortext == '' ? '请选择商铺类型' : selectortext}}</text>
-					</view>
-					<!-- #endif -->
-					
-					<!-- #ifdef MP-WEIXIN -->
 					<view class="but">
 						<input disabled="false" type="text" :placeholder="selectortext" /> <u-icon
 							name="arrow-down" style="position: absolute;top: 30%;right: 14rpx;"></u-icon>
 					</view>
-					<!-- #endif -->
 				</view>
+				
+				
+				
+				
 				<view class="listval">
 					<view class="tit"> 营业时间</view>
 					<view class="but"
@@ -117,6 +111,13 @@
 					<view class="tit"> 是否允许在非营业时间使用</view>
 					 <u-switch v-model="checkeds" active-color="#8883F0"></u-switch> 
 				</view>
+				<view class="listval">
+					<view class="tit"> 店铺描述</view>
+					<view class="but"> <input type="text" v-model="miaoshu" placeholder="请输入您的店铺描述"/> </view>
+				</view>
+				
+				
+				
 				<view class="baocun" @click="btncreat">
 					提交创建
 				</view>
@@ -139,6 +140,7 @@
 	export default {
 		data() {
 			return {
+				
 				bgc: {
 					backgroundColor: " #8883F0",
 				},
@@ -160,27 +162,7 @@
 				regionshow: false,
 				regiontext: '请选择省市区',
 				regionvalue: '',
-				selector: [{
-						value: 1,
-						label: '商场'
-					},
-					{
-						value: 2,
-						label: '学校'
-					},
-					{
-						value: 3,
-						label: '娱乐场所'
-					},
-					{
-						value: 4,
-						label: '出租房'
-					},
-					{
-						value: 5,
-						label: '其他'
-					},
-				],
+				selector: [],
 				latitude: '请输入纬度',
 				longitude: '请输入经度',
 				shopname: '',
@@ -196,7 +178,8 @@
 				area: '',
                 url:'',
 				id:'',
-				jtdz:''
+				jtdz:'',
+				miaoshu:''
 			}
 		},
 		onLoad(option) {
@@ -207,8 +190,21 @@
 		},
 		onShow() {
 			this.getQiniuToken()
+			this.getleixing()
 		},
 		methods: {
+			btnlx() {
+				this.selectorshow = true
+			},
+			
+			getleixing() {
+			    this.$u.get("/app/storeType/listAll").then(res => {
+			        this.selector = res.data.map(item => ({
+			            value: item.id,
+			            label: item.name
+			        }))
+			    })
+			},
 			handleLongPress(index) {
 				let that = this
 				uni.showModal({
@@ -356,9 +352,10 @@
 						specificAddress: this.xqdz,
 						contactName: this.shopname,
 						contactMobile: this.lxphone,
-						type: this.selectorvalue,
+						typeId: this.selectorvalue,
 						show:this.checked,
-						useOutTime:this.checkeds
+						useOutTime:this.checkeds,
+						description:this.miaoshu
 					}
 					this.$u.post("/app/store", data).then(res => {
 						if (res.code == 200) {
@@ -409,9 +406,7 @@
 				}
 			},
 
-			btnlx() {
-				this.selectorshow = true
-			},
+			
 			btnselector(e) {
 				this.selectorvalue = e[0].value
 				this.selectortext = e[0].label
@@ -432,7 +427,7 @@
 						this.latitude = res.latitude
 						this.longitude = res.longitude
 						this.xqdz = res.name
-						this.jtdz = res.address
+						this.jtdz = res.name
 					},
 					fail: function(err) {
 						// 检查错误消息，看是否是用户取消了位置选择  
@@ -448,8 +443,6 @@
 					},
 				})
 			},
-
-
 			getQiniuToken() {
 				this.$u.get("/common/qiniu/uploadInfo").then((res) => {
 					if (res.code == 200) {
diff --git a/page_fenbao/xinzeng/index.vue b/page_fenbao/xinzeng/index.vue
index 32f9c8b..d3f91a3 100644
--- a/page_fenbao/xinzeng/index.vue
+++ b/page_fenbao/xinzeng/index.vue
@@ -20,7 +20,7 @@
 												src="https://api.ccttiot.com/smartmeter/img/static/uZSiz7XWpxcXEkl6sTwj"
 												mode="aspectFit"></image>
 											<view class="sta_txt" v-if="item.status==3">
-												维修中
+												调试中
 											</view>
 											<view class="sta_txt" v-if="item.status==2" style="color:greenyellow;">
 												使用中
diff --git a/page_fenbao/zhuce.vue b/page_fenbao/zhuce.vue
index 2171ded..61fbe6b 100644
--- a/page_fenbao/zhuce.vue
+++ b/page_fenbao/zhuce.vue
@@ -229,6 +229,15 @@
 									this.mac = device.name.slice(5, 17)
 								}
 							})
+							let uniqueDevicesList = Array.from(new Set(this.devicesList));
+							this.devicesLists = uniqueDevicesList.map(device => {
+								const deviceId = device.name.slice(-12)
+								const newDevice = {
+									...device,
+									xuanz: "请选择",
+								}; // 直接在复制时添加 xuanz 字段  
+								return newDevice
+							})
 						}
 						break;
 					case xBlufi.XBLUFI_TYPE.TYPE_CONNECTED:
@@ -262,15 +271,15 @@
 						break;
 					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_STOP:
 						if (options.result) {
-							let uniqueDevicesList = Array.from(new Set(this.devicesList));
-							this.devicesLists = uniqueDevicesList.map(device => {
-								const deviceId = device.name.slice(-12)
-								const newDevice = {
-									...device,
-									xuanz: "请选择",
-								}; // 直接在复制时添加 xuanz 字段  
-								return newDevice
-							})
+							// let uniqueDevicesList = Array.from(new Set(this.devicesList));
+							// this.devicesLists = uniqueDevicesList.map(device => {
+							// 	const deviceId = device.name.slice(-12)
+							// 	const newDevice = {
+							// 		...device,
+							// 		xuanz: "请选择",
+							// 	}; // 直接在复制时添加 xuanz 字段  
+							// 	return newDevice
+							// })
 							let devicesarr = options.data
 							this.devicesList.forEach(device => {
 								if (device.name.substring(0, 4) == "CCYK") {
diff --git a/page_user/mapditu/index.vue b/page_user/mapditu/index.vue
index 159d6d5..3223be0 100644
--- a/page_user/mapditu/index.vue
+++ b/page_user/mapditu/index.vue
@@ -80,7 +80,7 @@
 												src="https://api.ccttiot.com/smartmeter/img/static/uZSiz7XWpxcXEkl6sTwj"
 												mode="aspectFit"></image>
 											<view class="sta_txt" v-if="item.status==3">
-												维修中
+												调试中
 											</view>
 											<view class="sta_txt" v-if="item.status==2" style="color:greenyellow;">
 												使用中
diff --git a/page_user/sbdetail.vue b/page_user/sbdetail.vue
index dc249cd..e901dbf 100644
--- a/page_user/sbdetail.vue
+++ b/page_user/sbdetail.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<u-navbar  :title="tittxt" :border-bottom="false" :background="bgc" back-icon-color="#000" title-color='#000'
-			title-size='36' height='50' id="navbar" >
+			title-size='36' height='50' id="navbar" :custom-back="btns">
 			<!-- :custom-back="btns" -->
 		</u-navbar>
 		<view class="zhuhu">
@@ -217,6 +217,13 @@
 									<view class="bot">解除绑定</view>
 							</view>
 						</view>
+						<view class="cont" @click="jiaozhunflag = true">
+							<view class="top">
+								<image src="https://api.ccttiot.com/smartmeter/img/static/uIIu0awWVaCskkQMyJYp" mode="aspectFit"
+									style="width: 44rpx;height: 40rpx;"></image>
+									<view class="bot">电量校准</view>
+							</view>
+						</view>
 						<!-- <view class="cont" @click="topage(4)">
 							<view class="top" style="border: 0;">
 								<image style="width: 44rpx;height: 44rpx;"
@@ -315,6 +322,20 @@
 				</view>
 			</view>
 		 </u-popup>
+		 
+		 <!-- 电量校准 -->
+		 <view class="dianliang" v-if="jiaozhunflag">
+		 	 <image class="bj" src="https://api.ccttiot.com/smartmeter/img/static/uvJFkqJb264nOgRunshs" mode=""></image>
+			 <view class="shuru">
+			 	<image @click="btnjian" src="https://api.ccttiot.com/smartmeter/img/static/umGCPelSgd4GAwClNYcN" mode=""></image>
+				<input type="text" v-model="wxs" :disabled="true"/>
+				<image @click="btnadd" src="https://api.ccttiot.com/smartmeter/img/static/uyHk8ogQq0MPOURwPXbT" mode=""></image>
+			 </view>
+			 <view class="anniu" @click="btndian">
+			 	确认校准
+			 </view>
+		 </view>
+		 <view class="mask" v-if="jiaozhunflag" @click="jiaozhunflag = false"></view>
 		
 	</view>
 </template>
@@ -391,7 +412,11 @@
 				userTpye_userid:'',
 				ver_dataflag:2,
 				showshop: false,
-				devicesarr:[]
+				devicesarr:[],
+				fanhui:'',
+				xishu:1,
+				wxs:'',
+				jiaozhunflag:false
 			}
 		},
 		onLoad(option) {
@@ -400,6 +425,9 @@
 			let id = option.id
 			this.id = id
 			this.gettanc()
+			if(option.fanhui){
+				this.fanhui = option.fanhui
+			}
 			if (option.flag) {
 				this.opflag = false
 			} else {
@@ -487,6 +515,38 @@
 			this.drawCanvas()
 		},
 		methods: {
+			// 点击减电量系数
+			btnjian() {
+			    const value = Number(this.wxs.slice(0, -1)) - 0.05
+			    this.wxs = value.toFixed(2) + '%'
+			},
+			btnadd() {
+			    const value = Number(this.wxs.slice(0, -1)) + 0.05
+			    this.wxs = value.toFixed(2) + '%'
+			}, 
+			// 点击校准电量
+			btndian(){
+				let data = {
+					deviceId: this.id,
+					wxs: this.wxs.slice(0,-1) / 100,
+				}
+				this.$u.put('/mch/device/setWxs', data).then(res => {
+					if (res.code == 200) {
+						this.jiaozhunflag = false
+						uni.showToast({
+							title: '校准成功',
+							icon: 'success',
+							duration: 2000
+						})
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+				})
+			},
 			// 点击修改名称
 			btnxgname(){
 				this.xgname = this.deviceInfo.deviceName
@@ -581,9 +641,13 @@
 			},
 			// 自定义返回
 			btns(){
-				uni.reLaunch({
-					url:'/pages/index/index'
-				})
+				// if(this.fanhui == 1){
+					uni.reLaunch({
+						url:'/pages/index/index'
+					})
+				// }else{
+				// 	uni.navigateBack()
+				// }
 			},
 			// 商户跳转进行中订单
 			btnshdd(){
@@ -955,6 +1019,11 @@
 			getDevice(id) {
 				this.$u.get("/app/device/" + id).then((res) => {
 					if (res.code == 200) {
+						if(res.data.wxs != null){
+							this.wxs = (res.data.wxs * 100).toFixed(2) + '%'
+						}else{
+							this.wxs = 100 + '%'
+						}
 						this.deviceInfo = res.data
 						this.qrResult = res.data.mac
 						this.modelId = res.data.modelTags
@@ -1665,7 +1734,71 @@
 	page {
 		background-color: #F9F8FF;
 	}
-
+	.dianliang{
+		position: fixed;
+		top: 30%;
+		left: 50%;
+		transform: translateX(-50%);
+		z-index: 3;
+		width: 680rpx;
+		height: 733rpx;
+		.anniu{
+			width: 636rpx;
+			height: 114rpx;
+			line-height: 114rpx;
+			text-align: center;
+			font-weight: 600;
+			font-size: 40rpx;
+			color: #FFFFFF;
+			background: #8883F0;
+			border-radius: 18rpx 18rpx 18rpx 18rpx;
+			position: absolute;
+			top: 570rpx;
+			left: 50%;
+			transform:translateX(-50%);
+			z-index: 2;
+		}
+		.shuru{
+			position: absolute;
+			top: 400rpx;
+			left: 50%;
+			transform:translateX(-50%);
+			z-index: 2;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			input{
+				width: 386rpx;
+				height: 88rpx;
+				border-radius: 15rpx 15rpx 15rpx 15rpx;
+				border: 1rpx solid #808080;
+				text-align: center;
+				line-height: 88rpx;
+				margin: 0 27rpx;
+			}
+			image{
+				width: 88rpx;
+				height: 88rpx;
+			}
+		}
+		.bj{
+			position: absolute;
+			top: 0;
+			left: 0;
+			z-index: 2;
+		}
+	}
+    .mask {
+    	width: 750rpx;
+    	height: 100vh;
+    	background: #000000;
+    	border-radius: 0rpx 0rpx 0rpx 0rpx;
+    	opacity: 0.2;
+    	z-index: 1;
+    	position: fixed;
+    	top: 0;
+    	left: 0;
+    }
 	.maskss {
 		width: 750rpx;
 		height: 100vh;
diff --git a/pages.json b/pages.json
index 835a569..1d18d1d 100644
--- a/pages.json
+++ b/pages.json
@@ -532,6 +532,17 @@
 						"transparentTitle": "always", //支付宝
 						"titlePenetrate": "YES" //支付宝
 					}
+				},{ 
+					"path": "hehuoren/shebeixq",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#8883F0",
+						"navigationBarTextStyle": "#FFFFFF",
+						"navigationStyle": "custom",
+						"transparentTitle": "always", //支付宝
+						"titlePenetrate": "YES" //支付宝
+					}
 				},{ 
 					"path": "hehuoren/hhrtx",
 					"style": {
diff --git a/pages/daili/index.vue b/pages/daili/index.vue
index 94685bf..722fc06 100644
--- a/pages/daili/index.vue
+++ b/pages/daili/index.vue
@@ -91,7 +91,7 @@
 										 <view class="" style="width: 20rpx;"></view>
 										状态:<view class="" style="width: 10rpx;"></view>
 										<view class="sta_txt" v-if="item.status==3">
-											维修中
+											调试中
 										</view>
 										<view class="sta_txt" v-if="item.status==2" style="color:red;">
 											使用中
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 191d541..aedc964 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,7 +2,8 @@
 	<view class="page">
 		<u-navbar :is-back="false" title="设备列表" :border-bottom="false" :background="bgc" title-color='#fff'
 					title-size='36' height='44'  id="navbar">
-				</u-navbar>
+	</u-navbar>
+	   
 
 		<u-mask :show="showtip" @click="show = false" :z-index='1000' />
 		<view class="tip_box" v-if="showtip">
@@ -106,17 +107,19 @@
 						<view class="" style="font-size: 28rpx;color: #808080;margin-top: 30rpx;">该店铺暂无设备...</view>
 					</view>
 					<view class="swiper_item">
-						<view class="card_box" v-for="(item,indexs) in items.wateringList" :key="indexs">
+						<view class="card_box" v-for="(item,indexs) in items.wateringList" :key="indexs" @click="todetail(item.deviceId)">
+							<text v-if="item.onlineStatus == 1" class="yuan" style="background-color: #00BA88;"></text>
+							<text v-if="item.onlineStatus == 0" class="yuan"></text>
 							<view class="card">
-								<view class="card_right" @click="todetail(item.deviceId)">
+								<view class="card_right">
 									<image v-if="item.customPicture" :src="item.customPicture" mode="aspectFit"
 										style="border-radius: 20rpx;"></image>
 									<image v-else :src="item.picture" mode="aspectFit"></image>
 								</view>
 								<view class="card_left">
-									<view class="card_left_tit" @click="todetail(item.deviceId)">
-										{{item.deviceName}}
-										<view class="card_left_sta" @click="todetail(item.deviceId)">
+									<view class="card_left_tit">
+										{{item.deviceName.length > 5 ? item.deviceName.slice(0,5) + '...' : item.deviceName}}
+										<view class="card_left_sta">
 											<text v-if="item.modelTags.some(tag => tag == 1)" style="margin-left: 20rpx;background-color: #0f5fe4d4;border: 1px solid #0f5fe4d4;">
 												蓝牙
 											</text>
@@ -129,14 +132,14 @@
 											<text v-if="item.modelTags.some(tag => tag == 3) && item.onlineStatus1 == 1 || item.modelTags.some(tag => tag == 3) && item.onlineStatus2 == 1">
 												4G
 											</text>
-											<text v-if="item.modelTags.includes(3) && item.onlineStatus1 == 0 && item.onlineStatus2 == 0" style="background-color: #ccc;border: 1px solid #ccc;">
+											<text v-if="item.modelTags.some(tag => tag == 3) && item.onlineStatus1 == 0 && item.onlineStatus2 == 0" style="background-color: #ccc;border: 1px solid #ccc;">
 												4G
 											</text>
 											<text v-if="item.wifi == null && !item.modelTags.some(tag => tag == 3) && !item.modelTags.some(tag => tag == 1)" style="background-color: red;color: #fff;border: 1px solid red;">未配网</text>
 										</view>
 									</view>
 									<view class="sta_txt" v-if="item.status==3" style="color:#fff;background-color: red;">
-										维修中
+										调试中
 									</view>
 									<view class="sta_txt" v-if="item.status==2" style="color:#fff;background-color: #ffba00;">
 										使用中
@@ -147,16 +150,16 @@
 									
 									<view class="" style="display: flex;align-items: center;">
 										<view class="card_left_no" :class="item.onlineStatus == 0 ? 'activewzgl' : ''"
-											@click="todetail(item.deviceId)">
+											@clic.stop="todetail(item.deviceId)">
 											S/N码：{{item.deviceNo}}
 										</view>
-										<view @click="sremakes(item)" v-if="item.storeId == null" class="dianpu"
+										<view @click.stop="sremakes(item)" v-if="item.storeId == null" class="dianpu"
 											style="border: 1px solid #ccc;padding: 5rpx;font-size:26rpx: border-box;width: 180rpx;border-radius: 20rpx;color: #ccc;text-align: center;margin-top: 10rpx;">
 											未分配店铺
 										</view>
 										<view v-else :class="item.onlineStatus == 0 ? 'activewzgl' : ''"
 											style="color: #95989D;padding-top: 20rpx;font-size: 26rpx;"
-											@click="todetail(item.deviceId)">
+											@click.stop="todetail(item.deviceId)">
 											店铺：{{item.storeName.length > 5 ? item.storeName.slice(0,5) + '...' : item.storeName}}
 										</view>
 									</view>
@@ -334,7 +337,9 @@
 				groupListone:[],
 				groupListsone:[],
 				shoplistone:[],
-				wateringListone:[]
+				wateringListone:[],
+				
+				
 			}
 		},
 		onLoad() {
@@ -404,6 +409,8 @@
 			}
 		},
 		methods: {
+			
+			
 			getlists() {
 			  this.$u.get(`/app/device/list?pageNum=${this.pagenum - 1}&pageSize=${this.pagesize}&orderByColumn=${this.pxzt}&isAsc=${this.pxdaoxu}&storeId=${this.storeId == null ? '' : this.storeId}&keyword=${this.keyword}`).then((res) => {
 			    if (res.code == 200) {
@@ -1418,7 +1425,7 @@
 			},
 			todetail(id) {
 				uni.navigateTo({
-					url: '/page_user/sbdetail?id=' + id
+					url: '/page_user/sbdetail?id=' + id + '&fanhui=' + 1
 				})
 			},
 			// 跳转到抄表
@@ -1433,6 +1440,8 @@
 
 <style lang="scss">
 	
+	
+	
 	.shuaxin {
 		width: 100%;
 		height: 110rpx;
@@ -2225,7 +2234,17 @@
 						margin-top: 34rpx;
 						display: flex;
 						flex-wrap: wrap;
-
+                        position: relative;
+						.yuan{
+							position: absolute;
+							top: 20rpx;
+							left: 20rpx;
+							display: inline-block;
+							width: 10rpx;
+							height: 10rpx;
+							border-radius: 50%;
+							background-color: red;
+						}
 						.card {
 							display: flex;
 							width: 680rpx;
diff --git a/pages/my.vue b/pages/my.vue
index 88b25db..3687ace 100644
--- a/pages/my.vue
+++ b/pages/my.vue
@@ -6,7 +6,7 @@
 
 		<view class="fdpage">
 			<view class="top_box">
-				<view class="userinfo">
+				<!-- <view class="userinfo">
 					<view class="info" @click="topage(5)">
 						<view class="username">
 							{{userinfo.userName == null ? '' : userinfo.userName}}
@@ -15,7 +15,7 @@
 							共{{userinfo.deviceCount == null ? 0 : userinfo.deviceCount}}台设备
 						</view>
 					</view>
-				</view>
+				</view> -->
 				<!-- <view class="tit">
 					我的钱包
 				</view> -->
@@ -27,12 +27,12 @@
 						<view class="bot">
 							钱包余额
 						</view>	
-						<view class="top" style="font-size: 24rpx;color: #FFFFFF;margin-top: 16rpx;">
+						<!-- <view class="top" style="font-size: 24rpx;color: #FFFFFF;margin-top: 16rpx;">
 							<view class="txt" style="font-size: 24rpx;">
 								￥
 							</view>
 							{{userinfo.balance == undefined ? '' : Number(userinfo.balance) + Number(userinfo.waitBonusAmount)}}
-						</view>
+						</view> -->
 						
 					</view>
 					<view class="cont" @click="topage(6)">
@@ -42,9 +42,9 @@
 						<view class="bot">
 							收款账户
 						</view>
-						<view class="" style="font-size: 24rpx;color: #FFFFFF;margin-top: 16rpx;">
+						<!-- <view class="" style="font-size: 24rpx;color: #FFFFFF;margin-top: 16rpx;">
 							微信收款
-						</view>
+						</view> -->
 					</view>
 					<view class="cont"  @click="topage(7)">
 						<view class="top" >
@@ -53,9 +53,9 @@
 						<view class="bot">
 							收支明细
 						</view>
-						<view class="" style="font-size: 24rpx;color: #FFFFFF;margin-top: 16rpx;">
+						<!-- <view class="" style="font-size: 24rpx;color: #FFFFFF;margin-top: 16rpx;">
 							近30天
-						</view>
+						</view> -->
 					</view>
 				</view>
 			</view>
@@ -78,7 +78,7 @@
 				</view>
 				<view style="margin-top:40rpx" class="botcard" @click="topage(4)">
 					<image src="https://api.ccttiot.com/smartmeter/img/static/uTZBKfNX9FO1iwFosYI8" mode="aspectFit"></image>
-					<view class="txt">安全中心</view>
+					<view class="txt">设置中心</view>
 				</view>
 				<view style="margin-top:40rpx" class="botcard" @click="btnbangzhu">
 					<image src="https://api.ccttiot.com/smartmeter/img/static/uyRB5Kph6fn7DBMqmaYI" mode="aspectFit"></image>
@@ -244,11 +244,14 @@
 					// uni.navigateTo({
 					// 	url:'/page_fenbao/statulist/fault/index'
 					// })
-					uni.showToast({
-						title:'该功能暂未开放',
-						icon: 'none',
-						duration: 2000
+					uni.navigateTo({
+						url:'/page_user/userSet'
 					})
+					// uni.showToast({
+					// 	title:'该功能暂未开放',
+					// 	icon: 'none',
+					// 	duration: 2000
+					// })
 				}else if(num==5){
 					uni.navigateTo({
 						url:'/page_user/userSet'
@@ -348,14 +351,14 @@ page{
 .page{
 	width: 750rpx;
 	height: 100vh;
-	.userpage{
-		.top_box{
-			padding-top: 40rpx;
-			width: 750rpx;
-			height: 352rpx;
-			background-color: #8883F0;
-		}	
-	}
+	// .userpage{
+	// 	.top_box{
+	// 		padding-top: 40rpx;
+	// 		width: 750rpx;
+	// 		height: 352rpx;
+	// 		background-color: #8883F0;
+	// 	}	
+	// }
 	.anniu{
 		width: 300rpx;
 		height: 120rpx;
@@ -370,9 +373,9 @@ page{
 	}
 	.fdpage{
 		.top_box{
-			padding-top: 40rpx;
+			// padding-top: 40rpx;	
 			width: 750rpx;
-			height: 470rpx;
+			max-height: 470rpx;
 			background-color: #F0EFFF;
 			.userinfo{
 				margin-left: 56rpx;
diff --git a/pages/shanghudd.vue b/pages/shanghudd.vue
index b3cf9d4..8e8a20a 100644
--- a/pages/shanghudd.vue
+++ b/pages/shanghudd.vue
@@ -1,9 +1,9 @@
 <template>
 	<view class="page" style="width: 100%;height: 88vh;overflow: scroll;">
 		<u-navbar :title="tittxt" :border-bottom="false" :background="bgc" back-icon-color="#fff" title-color='#fff'
-			:custom-back="btns" title-size='36' height='50' id="navbar">
+			 title-size='36' height='50' id="navbar">
 		</u-navbar>
-
+          <!-- :custom-back="btns" -->
 		<view class="dltop">
 			<view class="dian_list">
 				<view class="">
@@ -678,9 +678,10 @@
 			},
 			// 点击默认返回首页
 			btns() {
-				uni.reLaunch({
-					url: '/pages/shouye/index'
-				})
+				uni.navigateBack()
+				// uni.reLaunch({
+				// 	url: '/pages/shouye/index'
+				// })
 			},
 			// 点击结束订单
 			btnjieshu() {
diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue
index bcf313c..3eefe6d 100644
--- a/pages/shouye/index.vue
+++ b/pages/shouye/index.vue
@@ -299,7 +299,7 @@
 			},
 			// 获取最新公告
 			getgonggao(){
-				this.$u.get("/app/notice/new").then(res =>{
+				this.$u.get("/app/notice/new?noticeType=1").then(res =>{
 					if(res.code == 200){
 						this.announcements = res.data
 						this.$u.get(`/app/notice/${res.data.noticeId}`).then(resp =>{
diff --git a/pages/tj.vue b/pages/tj.vue
index 1dd4669..753e70b 100644
--- a/pages/tj.vue
+++ b/pages/tj.vue
@@ -9,6 +9,32 @@
 	   		@click="btnshouye"></image>
 	   	<text>运营</text>
 	   </view>
+	   <view class="gonggao" @click="btntopgg">
+	   	<u-icon name="volume-fill" color="#fff" style="position: absolute;left: 20rpx;" size="32"></u-icon>
+	   	<view class="container">
+	   	    <view class="scroll-text">
+	   	      <view class="scroll-item">
+	   	        {{announcements.noticeTitle == null ? '暂无最新公告！！！' : announcements.noticeTitle}}
+	   	      </view>
+	   	    </view>
+	   	</view>
+	   	<u-icon name="arrow-right" color="#fff" style="position: absolute;right: 10rpx;" size="32"></u-icon>
+	   </view>
+	   <!-- 公告弹窗 -->
+	   <view class="noticetc" v-if="gonggaoflag">
+	   	<view class="name">
+	   		创想物联公告
+	   	</view>
+	   	<view class="biaoti">
+	   		{{gonggaoxq.noticeTitle}}
+	   	</view>
+	   	<u-parse :html="gonggaoxq.noticeContent" style="width: 100%;height: 620rpx;background-color: #efefef;padding: 10rpx;box-sizing: border-box;margin-top: 20rpx;"></u-parse>
+	   	<view class="btn" @click="btnggtc">
+	   		我知道了
+	   	</view>
+	   </view>
+	   <view class="mask" v-if="gonggaoflag"></view>
+	   
 	   <image src="https://api.ccttiot.com/smartmeter/img/static/u3f8ZWoJQnnXNHEaXC2N" class="imgbj" mode=""></image>
 		<view class="box">
 			<view class="topding">
@@ -201,7 +227,11 @@
 				formattedThirtyDaysAgo:'',
 				zongprice:'',
 				zongnum:'',
-				userobj:{}
+				userobj:{},
+				
+				announcements: {},
+				gonggaoxq:{},
+				gonggaoflag:false,
 			}
 		},
 		// 分享到好友（会话）
@@ -224,6 +254,7 @@
            
 		},
 		onShow() {
+			this.getgonggao()
 			this.tabindex = 1
 			this.shoururiqilist =[]
 			this.revenuelist =[]
@@ -240,6 +271,38 @@
 			this.gettj()
 		},
 		methods: {
+			// 点击头部滚动通知
+			btntopgg(){
+				this.$u.get(`/app/notice/${this.announcements.noticeId}`).then(resp =>{
+					if(resp.code == 200){
+						this.gonggaoxq = resp.data
+						this.gonggaoflag = true
+					}
+				})
+			},
+			// 点击公告我知道了
+			btnggtc(){
+				this.gonggaoflag = false
+				uni.setStorageSync('noticeId', this.announcements.noticeId)
+			},
+			// 获取最新公告
+			getgonggao(){
+				this.$u.get("/app/notice/new?noticeType=2").then(res =>{
+					if(res.code == 200){
+						this.announcements = res.data
+						this.$u.get(`/app/notice/${res.data.noticeId}`).then(resp =>{
+							if(resp.code == 200){
+								this.gonggaoxq = resp.data
+								if(resp.data.noticeId != uni.getStorageSync('noticeId')){
+									this.gonggaoflag = true
+								}
+							}
+						})
+					}
+				})
+			},
+			
+			
 			// 点击导航栏回到首页
 			btnshouye() {
 				uni.reLaunch({
@@ -418,11 +481,111 @@
 </script>
 
 <style lang="scss">
+	.mask {
+		width: 100%;
+		height: 100vh;
+		position: fixed;
+		top: 0;
+		left: 50%;
+		transform: translateX(-50%);
+		background-color: #000;
+		opacity: .6;
+	}
+	.gonggao{
+		width: 680rpx;
+		height: 60rpx;
+		position: relative;
+		display: flex;
+		align-items: center;
+		margin-bottom: 10rpx;
+		background-color: rgba(255, 255, 255, .1);
+		margin: auto;
+	}
+	.container {
+	  width: 560rpx;
+	  height: 60rpx; /* 根据需要调整高度 */
+	  display: flex;
+	  align-items: center;
+	  margin: auto;
+	  overflow: hidden;
+	  position: relative;
+	  color: #fff;
+	  box-sizing: border-box;
+	}
+	.scroll-text {
+	  width: 100%;
+	  overflow: hidden;
+	  box-sizing: border-box;
+	  display: inline-block;
+	  white-space: nowrap;
+	  animation: scroll 8s linear infinite;
+	}
+	.scroll-item {
+	  display: inline-block;
+	  padding: 0 10px;
+	  font-size: 16px;
+	}
+	@keyframes scroll {
+	  0% {
+	    transform: translateX(100%);
+	  }
+	  100% {
+	    transform: translateX(-100%);
+	  }
+	}
+	.noticetc{
+		width: 680rpx;
+		height: 950rpx;
+		background-color: #fff;
+		border-radius: 20rpx;
+		padding: 0 20rpx;
+		box-sizing: border-box;
+		position: fixed;
+		top: 340rpx;
+		left: 50%;
+		transform: translateX(-50%);
+		z-index: 2;
+		.btn{
+			width: 600rpx;
+			height: 100rpx;
+			line-height: 100rpx;
+			text-align: center;
+			border-radius: 50rpx;
+			background-color: #8883F0;
+			color: #fff;
+			font-size: 32rpx;
+			font-weight: 600;
+			margin: auto;
+			margin-top: 30rpx;
+		}
+		.name{
+			width: 100%;
+			text-align: center;
+			font-size: 36rpx;
+			font-weight: 600;
+			margin-top: 30rpx;
+		}
+		.biaoti{
+			font-size: 32rpx;
+			margin-top: 20rpx;
+		}
+		.cont{
+			width: 100%;
+			height: 620rpx;
+			overflow: scroll;
+			background-color: #ececec;
+			margin-top: 20rpx;
+			padding: 20rpx;
+			box-sizing: border-box;
+		}
+	}
+	
+	
 	/deep/ .u-title{
 		padding-bottom: 20rpx;
 	}
 	/deep/ .u-icon__icon{
-		padding-bottom: 20rpx;
+		// padding-bottom: 20rpx;
 	}
 	.uni-ec-canvas {
 		width: 100%;
@@ -475,6 +638,9 @@
 		&::-webkit-scrollbar {
 			display: none;
 		}
+		padding-bottom: 50rpx;
+		box-sizing: barcode;
+		margin-top: 20rpx;
     }
 	.imgbj{
 		width: 100%;