Merge branch 'fanpeng' into 'develop'

Fanpeng

See merge request StarlockTeam/wx-starlock!23

manifest.json

@@ -3,7 +3,7 @@
     "appid" : "__UNI__933D519",
     "description" : "",
     "versionName" : "1.2.0",
-    "versionCode" : "31",
+    "versionCode" : "32",
     "transformPx" : false,
     /* 小程序特有相关 */
     "mp-weixin" : {

pages/autoLock/autoLock.vue

@@ -101,7 +101,7 @@
     check.value = $bluetooth.currentLockSetting.lockSettingInfo.autoLock === 1
     value.value = $bluetooth.currentLockSetting.lockSettingInfo.autoLockSecond
     const index = columns.value[0].findIndex(item => item.value === value.value)
-    if (index === -1) {
+    if (check.value && index === -1) {
       custom.value = true
       picker.value = [5]
       text.value = $bluetooth.currentLockSetting.lockSettingInfo.autoLockSecond.toString()

pages/createCard/createCard.vue

@@ -210,7 +210,6 @@
 
   const setTime = () => {
     const now = new Date()
-    now.setMinutes(0, 0, 0)
 
     return now.getTime()
   }

pages/createFace/createFace.vue

@@ -182,7 +182,6 @@
 
   const setTime = () => {
     const now = new Date()
-    now.setMinutes(0, 0, 0)
 
     return now.getTime()
   }

pages/createFingerprint/createFingerprint.vue

@@ -210,7 +210,6 @@
 
   const setTime = () => {
     const now = new Date()
-    now.setMinutes(0, 0, 0)
 
     return now.getTime()
   }

pages/createPalmVein/createPalmVein.vue

@@ -211,7 +211,6 @@
 
   const setTime = () => {
     const now = new Date()
-    now.setMinutes(0, 0, 0)
 
     return now.getTime()
   }

pages/createRemote/createRemote.vue

@@ -158,7 +158,6 @@
 
   const setTime = () => {
     const now = new Date()
-    now.setMinutes(0, 0, 0)
 
     return now.getTime()
   }

pages/lockDetail/lockDetail.vue

@@ -57,7 +57,10 @@
           class="menu-main-view"
           @click="routeJump({ name: 'keyList' })"
         >
-          <image class="menu-main-image" src="/static/images/icon_key.png"></image>
+          <image
+            class="menu-main-image transform-scale-90"
+            src="/static/images/icon_key.png"
+          ></image>
           <view>电子钥匙</view>
         </view>
         <view
@@ -73,7 +76,10 @@
           class="menu-main-view"
           @click="routeJump({ name: 'cardList' })"
         >
-          <image class="menu-main-image" src="/static/images/icon_card.png"></image>
+          <image
+            class="menu-main-image transform-scale-110"
+            src="/static/images/icon_card.png"
+          ></image>
           <view>卡</view>
         </view>
         <view
@@ -88,7 +94,7 @@
           v-if="
             currentLockInfo.lockFeature.bluetoothRemoteControl && currentLockInfo.keyRight === 1
           "
-          class="menu-main-view"
+          class="menu-main-view transform-scale-110"
           @click="routeJump({ name: 'remoteList' })"
         >
           <image class="menu-main-image" src="/static/images/icon_remote.png"></image>
@@ -115,10 +121,13 @@
           class="menu-main-view"
           @click="routeJump({ name: 'adminList' })"
         >
-          <image class="menu-main-image" src="/static/images/icon_admin_black.png"></image>
+          <image
+            class="menu-main-image transform-scale-140"
+            src="/static/images/icon_admin_black.png"
+          ></image>
           <view>授权管理员</view>
         </view>
-        <view class="menu-main-view" @click="routeJump({ name: 'recordList' })">
+        <view class="menu-main-view transform-scale-105" @click="routeJump({ name: 'recordList' })">
           <image class="menu-main-image" src="/static/images/icon_record.png"></image>
           <view>操作记录</view>
         </view>
@@ -526,8 +535,8 @@
 
         .menu-main-image {
           margin-bottom: 10rpx;
-          width: 60rpx;
+          width: 40rpx;
-          height: 60rpx;
+          height: 40rpx;
         }
       }
     }
@@ -558,8 +567,8 @@
 
     .setting-image {
       margin-left: 32rpx;
-      width: 48rpx;
+      width: 40rpx;
-      height: 48rpx;
+      height: 40rpx;
     }
   }
 </style>

pages/setting/setting.vue

@@ -27,7 +27,7 @@
     </view>
     <view
       v-if="
-        $bluetooth.currentLockSetting.lockSettingInfo.lockSound === 1 &&
+        $bluetooth.currentLockSetting.lockFeature.lockSound === 1 &&
         $bluetooth.currentLockSetting.lockBasicInfo.keyRight === 1
       "
       class="py-3 px-4 bg-white flex items-center justify-between text-base mb-4rpx"