From c340a52c352eeb22c00d408de356c7a0866a821a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Mon, 7 Oct 2024 10:35:37 +0800
Subject: [PATCH] =?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 @@
         <scroll-view v-if="deviceInfo" scroll-y="true" :style="{ height: deviceInfo.windowHeight + 'px' }"
                      lower-threshold="100" @refresherrefresh="refresherList" :refresher-enabled="true" @scrolltolower="nextPage"
                      :refresher-triggered="refresherTriggered">
-          <view class="search">
+          <view class="search" v-if="!(lockList.length === 0 && lockSearch.searchStr === '' && !focus)">
             <up-search :searchIconSize="48" :inputStyle="{ fontSize: '32rpx' }" @focus="getFocus" @blur="getBlur"
                        :height="80" placeholder="搜索" :clearabled="false" @change="changeSearch"
                        v-model="lockSearch.searchStr" bgColor="#ffffff" :showAction="false" maxlength="20"></up-search>
@@ -14,7 +14,7 @@
             <view v-if="lockList.length === 0 && lockSearch.searchStr === '' && !focus">
               <image src="/static/images/icon_add_round.png" mode="aspectFill" class="button-add-big"
                      @click="toSearchDevice"></image>
-              <view class="text">填加锁时，手机必须在锁旁边</view>
+              <view class="text">添加锁时，手机必须在锁旁边</view>
             </view>
             <view v-else>
               <view class="group" v-for="(group, grounIndex) in lockList" :key="group.groupId">
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 @@
   <view>
     <scroll-view v-if="deviceInfo" scroll-y="true" :style="{ height: deviceInfo.windowHeight + 'px' }"
                  lower-threshold="100" @refresherrefresh="refresherList" :refresher-enabled="true" @scrolltolower="nextPage"
-                 :refresher-triggered="refresherTriggered">
+                 :refresher-triggered="refresherTriggered" @scroll="scroll">
       <view class="list" v-if="requestFinished">
         <view v-if="notificationList.length === 0">
           <image class="empty-list" src="/static/images/background_empty_list.png" mode="aspectFill"></image>
@@ -11,7 +11,8 @@
         <up-swipe-action v-else>
           <up-swipe-action-item class="item" ref="swipeItem" :options="options"
                                 v-for="(notification,index) in notificationList" :key="notification.id"
-                                :threshold="50" @click="deleteNotification(notification, index)">
+                                :threshold="50" @click="deleteNotification(notification, index)" :index="index"
+                                :name="index">
           <view class="notification" @click="toDetail(index,notification)">
             <view v-if="notification.readAt === 0">
               <image class="icon" src="/static/images/icon_notification_unread.png" mode="aspectFill"></image>
@@ -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 @@
   <view>
     <view class="view">
       <view class="view-button">
-        <view style="width: 350rpx">名称</view>
+        <view style="width: 150rpx">名称</view>
         <view class="view-button" style="padding: 20rpx 0">
           <view class="info" style="line-height: 40rpx;word-break: break-all;">{{currentLockInfo.lockAlias}}</view>
         </view>