From ff3c5c9f9be400b3d2d892183d4af7dcdf7c8bbc Mon Sep 17 00:00:00 2001
From: xiaohei <11674173+xiaohei102908@user.noreply.gitee.com>
Date: Thu, 21 Dec 2023 18:22:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC1.0.6=20=202023-12-21=20=20lj?=
=?UTF-8?q?d=201=E3=80=81=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0=E4=BA=BA?=
=?UTF-8?q?=E5=91=98=E6=97=B6=E6=97=B6=E9=97=B4=E5=A4=AA=E7=9F=AD=E4=BB=A5?=
=?UTF-8?q?=E5=8F=8A=E6=B7=BB=E5=8A=A0=E5=87=AD=E8=AF=81=E6=97=B6=E9=97=B4?=
=?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98=202=E3=80=81=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D=E4=BA=86=E7=A7=9F=E5=AE=A2=E7=AB=AF=E3=80=81=E7=A7=BB?=
=?UTF-8?q?=E5=8A=A8=E7=AB=AF=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4=E8=93=9D?=
=?UTF-8?q?=E7=89=99=E5=AF=86=E7=A0=81=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app.json | 2 +-
pages/addperson/addperson.js | 7 +++++--
pages/personManger/personManger.js | 5 +++--
pages/userbluetoothUnlock/userbluetoothUnlock.js | 10 +++++++++-
pages/userbluetoothUnlock/userbluetoothUnlock.wxml | 8 ++++----
pagesA/passwordList/passwordList.js | 6 ++++--
utils/ICINPakage/ICINLocker.js | 15 +++++++++++++++
7 files changed, 41 insertions(+), 12 deletions(-)
diff --git a/app.json b/app.json
index c3b79dc..f223a0c 100644
--- a/app.json
+++ b/app.json
@@ -48,7 +48,7 @@
},
"plugins": {
"myPlugin": {
- "version": "1.7.0",
+ "version": "1.7.1",
"provider": "wx8c85a8eeaad80bbf"
}
},
diff --git a/pages/addperson/addperson.js b/pages/addperson/addperson.js
index 2c9827b..35cae42 100644
--- a/pages/addperson/addperson.js
+++ b/pages/addperson/addperson.js
@@ -1617,24 +1617,27 @@ Page({
console.log(res, '获取索引')
if (res.success) {
var pwdNo = res.data.index.toString(16)
+ // var pwdNo = res.data.index
var passwordIndex = res.data.index
if (pwdNo < 9) {
pwdNo = '0' + pwdNo
} else {
pwdNo = pwdNo
}
+ console.log("1626", pwdNo);
ICINLocker.getUserSignKey(cgInfo.lockerId, cgInfo.superId, personInfo.userId, cgInfo.superId, cgInfo.authKey, '01', (callback) => {
- console.log(callback)
+ console.log("1628",callback)
if (callback.status == '00') {
var userSignKey = callback.userSignKey
ICINLocker.getCommonKey(cgInfo.lockerId, personInfo.userId, personInfo.userId, userSignKey, (callback) => {
+ console.log("1632", callback);
if (callback.status == '00') {
console.log(callback, 'commonKey')
var commonKey = callback.commonKey
var startTime = passwordLi.startTime.toString(16).toUpperCase()
var endTime = passwordLi.endTime.toString(16).toUpperCase()
ICINLocker.handlePwd(deviceinfo.deviceNum, cgInfo.superId, personInfo.userId, info.password, pwdNo, cgInfo.superId, cgInfo.authKey, '', startTime, endTime, 0, commonKey, (callback) => {
- console.log(callback)
+ console.log("1639",callback)
if (callback.status == '00') {
var datacom = {
code: "zg/bleSendVoucherReply",
diff --git a/pages/personManger/personManger.js b/pages/personManger/personManger.js
index 21382b6..ffe80a2 100644
--- a/pages/personManger/personManger.js
+++ b/pages/personManger/personManger.js
@@ -111,7 +111,7 @@ Page({
var deviceinfo = wx.getStorageSync('deviceinfo')
var cgInfo = wx.getStorageSync('cgInfo')
let starttime = moment().format('YYYY-MM-DD HH:mm:ss')
- let endtime = moment().add(30,'days').format('YYYY-MM-DD HH:mm:ss')
+ let endtime = moment().add(365,'days').format('YYYY-MM-DD HH:mm:ss')
if(deviceinfo.roomId){
this.getSiteTenant(deviceinfo.roomId)
}
@@ -370,6 +370,7 @@ Page({
endTime:endTime
}
methods.bluetoothOperation_ZH(this.data.cgInfo,info,1).then(result=>{
+ console.log("373",result);
if (result.status == '00') {
var dataPasswod = {
lockerId: this.data.deviceinfo.deviceNum,
@@ -698,7 +699,7 @@ Page({
// url: '/pages/addperson/addperson?current=' + current,
// })
// return
- if (deviceinfo.manufactureId == 201||deviceinfo.manufactureId == 201) {
+ if (deviceinfo.manufactureId == 201||deviceinfo.manufactureId == 221) {
if (app.globalData.zgBlueStatus) {
if (current == 1) {
wx.hideLoading()
diff --git a/pages/userbluetoothUnlock/userbluetoothUnlock.js b/pages/userbluetoothUnlock/userbluetoothUnlock.js
index cadcf9b..1fe617c 100644
--- a/pages/userbluetoothUnlock/userbluetoothUnlock.js
+++ b/pages/userbluetoothUnlock/userbluetoothUnlock.js
@@ -111,6 +111,12 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
+ var personinfo = wx.getStorageSync('info')
+ console.log(personinfo);
+ this.setData({
+ minDate: moment(personinfo.startTime).format('YYYY-MM-DD HH:mm:ss'),
+ minDate1: moment(personinfo.endTime).format('YYYY-MM-DD HH:mm:ss')
+ })
var userRole = wx.getStorageSync('userRole') || ''
this.setData({
userRole
@@ -160,6 +166,7 @@ Page({
this.getApartmentCardInfoMethods()
this.getPassWordMehods()
app.globalData.deviceNum = deviceinfo.deviceNum
+ console.log("169",this.data.minDate, this.data.minDate1);
if(deviceinfo.manufactureId == 101){
app.watch(this.getcartcount, 'backdata')
app.watch(this.fingerprintFun, 'fingerprintId')
@@ -175,6 +182,7 @@ Page({
id:deviceinfoList[0].cardId,
}
WXAPI.getApartmentCardInfo(data).then(res=>{
+ console.log("184",res);
if(res.success){
let leases = res.data.leases
if(leases.length>0){
@@ -296,7 +304,7 @@ Page({
})
},
bindDateChangeAddTwo(e){
- var str = e.detail.value + " 00:00:00"
+ var str = e.detail.value + " 23:59:59"
this.setData({
endtime: str
})
diff --git a/pages/userbluetoothUnlock/userbluetoothUnlock.wxml b/pages/userbluetoothUnlock/userbluetoothUnlock.wxml
index 9c8d84b..810ff05 100644
--- a/pages/userbluetoothUnlock/userbluetoothUnlock.wxml
+++ b/pages/userbluetoothUnlock/userbluetoothUnlock.wxml
@@ -47,18 +47,18 @@
蓝牙开锁
-
+
-
+