From fcf3297f5d4eca0fb5881c3375d380e9283c694d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= Date: Mon, 30 Sep 2024 14:03:25 +0800 Subject: [PATCH 1/9] =?UTF-8?q?feat:=20=E6=B6=88=E6=81=AF=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/notification.js | 39 +++ manifest.json | 4 +- pages.json | 18 + pages/home/home.vue | 6 +- .../notificationDetail/notificationDetail.vue | 56 ++++ pages/notificationList/notificationList.vue | 311 ++++++++++++++++++ static/images/icon_delete.png | Bin 0 -> 1088 bytes static/images/icon_notification_read.png | Bin 0 -> 11273 bytes static/images/icon_notification_unread.png | Bin 0 -> 10213 bytes .../images/tabbar_notification_no_select.png | Bin 0 -> 1273 bytes static/images/tabbar_notification_select.png | Bin 0 -> 1307 bytes stores/basic.js | 57 +++- stores/notification.js | 47 +++ 13 files changed, 532 insertions(+), 6 deletions(-) create mode 100644 api/notification.js create mode 100644 pages/notificationDetail/notificationDetail.vue create mode 100644 pages/notificationList/notificationList.vue create mode 100644 static/images/icon_delete.png create mode 100755 static/images/icon_notification_read.png create mode 100755 static/images/icon_notification_unread.png create mode 100644 static/images/tabbar_notification_no_select.png create mode 100644 static/images/tabbar_notification_select.png create mode 100644 stores/notification.js diff --git a/api/notification.js b/api/notification.js new file mode 100644 index 0000000..472a636 --- /dev/null +++ b/api/notification.js @@ -0,0 +1,39 @@ +import request from '../utils/request' + +// Notification 通知模块 + +// 获取通知列表 +export function getNotificationList(data) { + return request({ + url: '/notifications/list', + method: 'POST', + data + }) +} + +// 标记消息为已读 +export function markAsReadNotification(data) { + return request({ + url: '/notifications/markAsRead', + method: 'POST', + data + }) +} + +// 删除所有通知 +export function deleteAllNotification(data) { + return request({ + url: '/notifications/deleteAll', + method: 'POST', + data + }) +} + +// 删除通知 +export function deleteNotification(data) { + return request({ + url: '/notifications/delete', + method: 'POST', + data + }) +} diff --git a/manifest.json b/manifest.json index bca47ef..bf621a3 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "wx-starlock", "appid" : "__UNI__933D519", "description" : "", - "versionName" : "1.0.2", - "versionCode" : "22", + "versionName" : "1.1.0", + "versionCode" : "23", "transformPx" : false, /* 小程序特有相关 */ "mp-weixin" : { diff --git a/pages.json b/pages.json index 66fb723..c1ad0ed 100644 --- a/pages.json +++ b/pages.json @@ -122,6 +122,18 @@ "disableScroll": true, "navigationBarTitleText": "钥匙详情" } + }, + { + "path": "pages/notificationList/notificationList", + "style": { + "navigationBarTitleText": "通知列表" + } + }, + { + "path": "pages/notificationDetail/notificationDetail", + "style": { + "navigationBarTitleText": "消息详情" + } } ], "globalStyle": { @@ -144,6 +156,12 @@ "selectedIconPath": "static/images/tabbar_key_select.png", "text": "设备" }, + { + "pagePath": "pages/notificationList/notificationList", + "iconPath": "static/images/tabbar_notification_no_select.png", + "selectedIconPath": "static/images/tabbar_notification_select.png", + "text": "消息" + }, { "pagePath": "pages/mine/mine", "iconPath": "static/images/tabbar_mine_no_select.png", diff --git a/pages/home/home.vue b/pages/home/home.vue index fd34b7b..874f957 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -124,7 +124,7 @@ ...mapState(useLockStore, ['lockList', 'lockTotal', 'lockSearch']), ...mapState(useBluetoothStore, ['bluetoothStatus', 'isInitBluetooth', 'keyId', 'currentLockInfo']), }, - async onLoad() { + async onLoad(data) { uni.showLoading({ title: '加载中', mask: true @@ -158,6 +158,8 @@ this.penging = false uni.hideLoading() } + const _data = JSON.parse(JSON.stringify(data)) + this.shareJump(_data) }, methods: { timeFormat, @@ -165,7 +167,7 @@ ...mapActions(useLockStore, ['getLockList', 'updateLockList', 'getRole', 'getTimeLimit', 'updateLockSearch', 'getPowerIcon']), ...mapActions(useBluetoothStore, ['getBluetoothStatus', 'initAndListenBluetooth', 'updateCurrentLockInfo', 'checkSetting', 'updateKeyId', 'resetDevice']), - ...mapActions(useBasicStore, ['routeJump', 'getDeviceInfo', 'getNetworkType']), + ...mapActions(useBasicStore, ['routeJump', 'getDeviceInfo', 'getNetworkType', 'shareJump']), async deleteLock(lock, groupIndex, lockIndex) { const that = this const netWork = await this.getNetworkType() diff --git a/pages/notificationDetail/notificationDetail.vue b/pages/notificationDetail/notificationDetail.vue new file mode 100644 index 0000000..aa3ec18 --- /dev/null +++ b/pages/notificationDetail/notificationDetail.vue @@ -0,0 +1,56 @@ + + + + + + + diff --git a/pages/notificationList/notificationList.vue b/pages/notificationList/notificationList.vue new file mode 100644 index 0000000..28b8412 --- /dev/null +++ b/pages/notificationList/notificationList.vue @@ -0,0 +1,311 @@ + + + + + + + diff --git a/static/images/icon_delete.png b/static/images/icon_delete.png new file mode 100644 index 0000000000000000000000000000000000000000..0c990eccbbe07ffbc5b832f147341d7f8621f51d GIT binary patch literal 1088 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 literal 0 HcmV?d00001 diff --git a/static/images/tabbar_notification_no_select.png b/static/images/tabbar_notification_no_select.png new file mode 100644 index 0000000000000000000000000000000000000000..9ea52885637d3df70d6b6e39e0ae831bd1808165 GIT binary patch literal 1273 zcmcgsYc!h&7=FK8h)BA)p1E|=Zj_;nN{+fEjx{w!Tq?4mnGO|O-HxFn{b*^ctgTU| zTGzNHSd6L(Id$T=wp6t?w^V71V`JJ8v6}tfpPjRF_T#zyc+T_wdCzl&?ZYAy4T%6i z_B`(4zo+QmAgJweuj}VSdx9kTv)rNSf$X-IeYQ z2stZqliso97Z|hEO&Ma0~b`*7gbqm%~U*+h-VdcEKCc5=r=TXZ4?m0+#tZXM* z{O7^nsA(3^SEytX(#LR`(Oty<{xT2=JE)8!aBlRLk zTUEWK8I5XYd()%!gJx5*RvZW$oS&NCyyd)>4MvNU%rcCGg*<}`&zv0on)`P zu5;@-U<5^%J3oB1@K{2eAO#^{vF3toFDhod#8)9WtMHsd%P&)-TR(T>n(lC-D(|ya zNDa@mtk-%C&_@07`0Hd;7~7`i_pE9np(#vjE>0e9C+Lb6W^brFPvKs*F(bLT%br>l zB-ZXIMVv&dr*4dOSMKbWkq};iW9_=+cad=EbvRzn6c8tE2N5{ZTD-H_%i-)H305u)bqe6mGBl&&c4J6V#Qu!zD13_Bjf92Nt2}uvR#AM6W8GM7 zS9Xrb(;Dc1;ixFQkXl4HRqE;ORCV#^V6ev}yjDTRY{Gw6_ zKs7%ta0C*iz^>;5c!z2pCE$V&C3iQuu39NXTHY#cR4V^j&Hl57t!{`c(4Kb~p^P4h z9KfLUk+KjBwLE$_9}fW|=sg^RFkEbX#t2wB|>>SNksgd|v;@IDvv(q2<-v93Bk9&XPZwjQ4=92(` zvOb6_uq67Qhy;r_`A8mF0!a`Aa-gzp!2kfRV?EbTm>mADz)$ei3Ua{OuO0RGJocb6 za)Qlj|J>^Q7OlsD(o->N=l##6FRz*OA+>G;v-XLn=r#G1(h5ymqRGw|K@*6U-t(^A zx8-X9R)=a*rVawcSE3(`7Djg%(%1V80Zl!o?NJ#P&;wPgXz}4b z3qLJrcO9KhNj_6L@VYiXb@0%SRtn60!`^9=`L-{qa>pI60ZE@KGmMGzi9^q5`hwCx zH(U&aH_pBHu^pLIU)6NtySya95dYLkv%LVbc(W|$sJfY9%B#Xc|98R)0_4bN+zF_8 zolpeeGBq7Rh8fuvHGt4)y6XVb6MPW@S9*rhR>0WEMKuQaTHWkU=zrxe!b6d&YPK2L z?;cf?fX$4U%|eROY(z9bH#C~SUXSXTB^1TEUt2g@@ObyrV|9~yhZ8m!59&6Z1Vj@2gZ(`J%j z%W#~y?y?NMbm9?LH;j#<9 z-#4U6LwCM%8$a%`d<}#kw<9bMn`8MW|4v@<_64%Lo%PIbpjM9`Z` zH|z#}!0uaqpsDm0d0OM`T z)2{uU$YeNle7uO<^f_~3Fm7K`*e*sF?Fn<65 literal 0 HcmV?d00001 diff --git a/stores/basic.js b/stores/basic.js index b5ae7c6..bbc4e8c 100644 --- a/stores/basic.js +++ b/stores/basic.js @@ -96,6 +96,16 @@ const pages = [ name: 'keyDetail', path: '/pages/keyDetail/keyDetail', tabBar: false + }, + { + name: 'notificationList', + path: '/pages/notificationList/notificationList', + tabBar: true + }, + { + name: 'notificationDetail', + path: '/pages/notificationDetail/notificationDetail', + tabBar: false } ] @@ -106,7 +116,9 @@ export const useBasicStore = defineStore('basic', { // 设备信息 deviceInfo: null, // 胶囊按钮的位置信息 - buttonInfo: null + buttonInfo: null, + // 分享配置 + shareConfig: {} } }, actions: { @@ -207,6 +219,47 @@ export const useBasicStore = defineStore('basic', { }, 300) } }) - } + }, + // 分享跳转 + shareJump(data = this.shareConfig) { + if (data.path) { + const target = data.path.split('/') + if (target.length > 1) { + data.path = data.path.slice(target[0].length + 1, data.path.length) + } else { + delete data.path + } + const page = pages.find((page) => { + return page.name === target[0] + }) + if (page) { + if (page.tabBar) { + wx.switchTab({ + url: page.path + }) + } else { + const url = page.path + '?' + getParams(data) + wx.navigateTo({ url }) + } + } else { + delete data.path + } + } else { + delete data.path + } + this.shareConfig = data + + function getParams(params) { + let paramStr = '' + Object.keys(params).forEach((item) => { + if (paramStr === '') { + paramStr = `${item}=${params[item]}` + } else { + paramStr = `${paramStr}&${item}=${params[item]}` + } + }) + return paramStr + } + }, } }) diff --git a/stores/notification.js b/stores/notification.js new file mode 100644 index 0000000..4ed4ce3 --- /dev/null +++ b/stores/notification.js @@ -0,0 +1,47 @@ +import { defineStore } from 'pinia' +import { getNotificationList } from '../api/notification' + +export const useNotificationStore = defineStore('notification', { + state() { + return { + // 通知列表 + notificationList: [], + // 通知总数 + notificationTotal: 0, + // 通知列表搜索数据 + notificationSearch: { + pageNo: 1, + pageSize: 50, + }, + } + }, + actions: { + // 删除通知列表某一项数据 + deleteNotificationItem (index) { + this.notificationList.splice(index, 1) + }, + // 更新某一项通知列表数据 + updateNotificationItem (index, params) { + this.notificationList[index] = { ...this.notificationList[index], ...params } + }, + // 更新通知列表搜索数据 + updateNotificationSearch (params) { + this.notificationSearch = { ...this.notificationSearch, ...params } + }, + // 获取通知列表 + async getNotificationList (params) { + const { code, data, message } = await getNotificationList({ pageNo: params.pageNo, pageSize: params.pageSize }) + if(code === 0) { + this.notificationTotal = data.total + if(params.pageNo === 1) { + this.notificationList = data.list + } else { + this.notificationList = this.notificationList.concat(data.list) + } + return { code } + } else { + return { code, message } + } + }, + } +}) From 4a2614ff83d84b0953577f639535f9de600fe695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= Date: Mon, 30 Sep 2024 15:18:05 +0800 Subject: [PATCH 2/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8=E6=9C=AA?= =?UTF-8?q?=E6=9B=B4=E6=96=B0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/mine.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue index 7ae0dea..5cbcfff 100644 --- a/pages/mine/mine.vue +++ b/pages/mine/mine.vue @@ -67,6 +67,7 @@ import { phoneLoginRequest } from '@/api/user' import env from '@/config/env' import { setStorage, getStorage, removeStorage } from '@/utils/storage' + import { useNotificationStore } from '../../stores/notification' export default { data() { @@ -80,7 +81,8 @@ }, computed: { ...mapState(useUserStore, ['isLogin']), - ...mapState(useLockStore, ['lockSearch']) + ...mapState(useLockStore, ['lockSearch']), + ...mapState(useNotificationStore, ['notificationSearch']) }, async onLoad() { this.buttonInfo = await this.getButtonInfo() @@ -97,6 +99,7 @@ methods: { ...mapActions(useBasicStore, ['getButtonInfo', 'routeJump']), ...mapActions(useLockStore, ['getLockList', 'updateLockSearch']), + ...mapActions(useNotificationStore, ['getNotificationList', 'updateNotificationSearch']), ...mapActions(useUserStore, ['updateLoginStatus', 'phoneLogin', 'updateUserInfo', 'getUserInfo', 'checkSession']), selectEnv(env) { @@ -138,6 +141,10 @@ }) this.getUserInfo() this.getLockList(this.lockSearch) + this.updateNotificationSearch({ + pageNo: 1 + }) + this.getNotificationList(this.notificationSearch) uni.showToast({ title: '账号切换成功', icon: 'none' From c340a52c352eeb22c00d408de356c7a0866a821a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= Date: Mon, 7 Oct 2024 10:35:37 +0800 Subject: [PATCH 3/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E5=88=97=E8=A1=A8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 2 +- pages/home/home.vue | 4 ++-- pages/notificationList/notificationList.vue | 12 ++++++++++-- pages/setting/setting.vue | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/manifest.json b/manifest.json index bf621a3..e9a261a 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "appid" : "__UNI__933D519", "description" : "", "versionName" : "1.1.0", - "versionCode" : "23", + "versionCode" : "24", "transformPx" : false, /* 小程序特有相关 */ "mp-weixin" : { diff --git a/pages/home/home.vue b/pages/home/home.vue index 874f957..9e3ae1e 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -5,7 +5,7 @@ - + @@ -14,7 +14,7 @@ - 填加锁时,手机必须在锁旁边 + 添加锁时,手机必须在锁旁边 diff --git a/pages/notificationList/notificationList.vue b/pages/notificationList/notificationList.vue index 28b8412..25d4c38 100644 --- a/pages/notificationList/notificationList.vue +++ b/pages/notificationList/notificationList.vue @@ -2,7 +2,7 @@ + :refresher-triggered="refresherTriggered" @scroll="scroll"> @@ -11,7 +11,8 @@ + :threshold="50" @click="deleteNotification(notification, index)" :index="index" + :name="index"> @@ -78,6 +79,13 @@ export default { timeFormat, ...mapActions(useNotificationStore, ['getNotificationList', 'updateNotificationSearch', 'updateNotificationItem','deleteNotificationItem']), ...mapActions(useBasicStore, ['routeJump', 'getDeviceInfo', 'getNetworkType']), + scroll(e) { + this.$refs.swipeItem.forEach(item => { + if(item.show) { + item.closeHandler() + } + }) + }, async deleteNotification (notification, index) { const netWork = await this.getNetworkType() if (!netWork) { diff --git a/pages/setting/setting.vue b/pages/setting/setting.vue index 9149230..39f3c1b 100644 --- a/pages/setting/setting.vue +++ b/pages/setting/setting.vue @@ -2,7 +2,7 @@ - 名称 + 名称 {{currentLockInfo.lockAlias}} From 6d3274c183707a10e097c4c7822bd11c3327232d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= Date: Mon, 7 Oct 2024 14:16:26 +0800 Subject: [PATCH 4/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=97=A0=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/home/home.vue | 4 +- pages/notificationList/notificationList.vue | 98 ++++++++++++++++----- stores/user.js | 8 +- 3 files changed, 84 insertions(+), 26 deletions(-) diff --git a/pages/home/home.vue b/pages/home/home.vue index 9e3ae1e..3a00ecc 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -77,7 +77,7 @@ - @@ -622,7 +622,7 @@ page { .button-add-big { width: 400rpx; height: 400rpx; - margin-top: 250rpx; + margin-top: 300rpx; margin-left: 136rpx; } diff --git a/pages/notificationList/notificationList.vue b/pages/notificationList/notificationList.vue index 25d4c38..e2d3e46 100644 --- a/pages/notificationList/notificationList.vue +++ b/pages/notificationList/notificationList.vue @@ -1,8 +1,8 @@ + + diff --git a/pages/home/home.vue b/pages/home/home.vue index 3a00ecc..039aebc 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -405,21 +405,9 @@ this.focus = false }, async toSearchDevice() { - if(this.bluetoothStatus !== 0) { - this.getBluetoothStatus() - return - } - let result = true - if(!this.isInitBluetooth) { - result = await this.initAndListenBluetooth() - } - if(result) { - this.routeJump({ - name: 'searchDevice' - }) - } else { - this.checkSetting() - } + this.routeJump({ + name: 'addLockGuid' + }) }, async toLockDeatil(lock) { if(!(this.bluetoothStatus === 0 || this.bluetoothStatus === -1)) { diff --git a/pages/verifyEmail/verifyEmail.vue b/pages/verifyEmail/verifyEmail.vue index 1e5519e..3e530f3 100644 --- a/pages/verifyEmail/verifyEmail.vue +++ b/pages/verifyEmail/verifyEmail.vue @@ -2,7 +2,7 @@ 为了你的账号安全,修改账号前请先使用验证码验证 - {{text}} diff --git a/static/images/icon_lock_touch_screen.png b/static/images/icon_lock_touch_screen.png new file mode 100755 index 0000000000000000000000000000000000000000..de3f36335b24502d287e2a02687232cac70da3e8 GIT binary patch literal 39349 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 e?ctuZEx;{;U4f{MzGSNa diff --git a/stores/basic.js b/stores/basic.js index bbc4e8c..127e622 100644 --- a/stores/basic.js +++ b/stores/basic.js @@ -106,6 +106,11 @@ const pages = [ name: 'notificationDetail', path: '/pages/notificationDetail/notificationDetail', tabBar: false + }, + { + name: 'addLockGuid', + path: '/pages/addLockGuid/addLockGuid', + tabBar: false } ] From 64cc4512417312c66427f0b3091e70045f00ff00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= Date: Thu, 10 Oct 2024 18:06:19 +0800 Subject: [PATCH 7/9] =?UTF-8?q?fix:=20=E5=BC=95=E5=AF=BC=E9=A1=B5=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E9=94=80=E6=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 2 +- pages/addLockGuid/addLockGuid.vue | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 8395c69..e0415b3 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "appid" : "__UNI__933D519", "description" : "", "versionName" : "1.1.0", - "versionCode" : "26", + "versionCode" : "27", "transformPx" : false, /* 小程序特有相关 */ "mp-weixin" : { diff --git a/pages/addLockGuid/addLockGuid.vue b/pages/addLockGuid/addLockGuid.vue index 2a3788b..02fbbb7 100644 --- a/pages/addLockGuid/addLockGuid.vue +++ b/pages/addLockGuid/addLockGuid.vue @@ -33,6 +33,7 @@ export default { } if(result) { this.routeJump({ + type: 'redirectTo', name: 'searchDevice' }) } else { From 480619beb2dda28c486b7c398a5648aa9f96a159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= Date: Sat, 12 Oct 2024 08:57:37 +0800 Subject: [PATCH 8/9] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=9A=84=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/home/home.vue | 2 +- pages/keyList/keyList.vue | 2 +- pages/passwordList/passwordList.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/home/home.vue b/pages/home/home.vue index 039aebc..98bb142 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -8,7 +8,7 @@ + v-model="lockSearch.searchStr" bgColor="#ffffff" :showAction="false" maxlength="50"> diff --git a/pages/keyList/keyList.vue b/pages/keyList/keyList.vue index eab770d..6ee125f 100644 --- a/pages/keyList/keyList.vue +++ b/pages/keyList/keyList.vue @@ -6,7 +6,7 @@ + v-model="keySearch.searchStr" bgColor="#ffffff" :showAction="false" maxlength="50"> diff --git a/pages/passwordList/passwordList.vue b/pages/passwordList/passwordList.vue index 3ed0ea8..24289d7 100644 --- a/pages/passwordList/passwordList.vue +++ b/pages/passwordList/passwordList.vue @@ -6,7 +6,7 @@ + v-model="passwordSearch.searchStr" bgColor="#ffffff" :showAction="false" maxlength="50"> From 72f03628107173fa20883e9a0360e1e791cba86e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= Date: Wed, 16 Oct 2024 13:55:10 +0800 Subject: [PATCH 9/9] =?UTF-8?q?fix:=201.1.1=E7=89=88=E6=9C=AC=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81=E5=90=8E?= =?UTF-8?q?=E6=96=B0=E8=8E=B7=E5=8F=96=E5=AF=86=E7=A0=81=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E7=94=A8=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 4 ++-- pages/passwordList/passwordList.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index e0415b3..4f4f363 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "wx-starlock", "appid" : "__UNI__933D519", "description" : "", - "versionName" : "1.1.0", - "versionCode" : "27", + "versionName" : "1.1.1", + "versionCode" : "28", "transformPx" : false, /* 小程序特有相关 */ "mp-weixin" : { diff --git a/pages/passwordList/passwordList.vue b/pages/passwordList/passwordList.vue index 24289d7..aef2bea 100644 --- a/pages/passwordList/passwordList.vue +++ b/pages/passwordList/passwordList.vue @@ -193,7 +193,7 @@ export default { if(code === 0) { const { code: requestCode, message } = await resetPsaawordListRequest({ lockId: that.currentLockInfo.lockId, - passwordKey: that.currentLockInfo.bluetooth.passwordKey + passwordKey: that.currentLockInfo.encrpyKey }) console.log('重置密码返回', requestCode, message) if(requestCode === 0) {