Merge branch 'fanpeng' into 'develop'

Fanpeng

See merge request StarlockTeam/wx-starlock!21

api/key.js

@@ -82,3 +82,39 @@ export function getKeyRequest(data) {
     data
   })
 }
+
+// 冻结电子钥匙
+export function freezeKeyRequest(data) {
+  return request({
+    url: '/key/freeze',
+    method: 'POST',
+    data
+  })
+}
+
+// 解冻电子钥匙
+export function unfreezeKeyRequest(data) {
+  return request({
+    url: '/key/unfreeze',
+    method: 'POST',
+    data
+  })
+}
+
+// 设置授权管理员
+export function authorizeKeyRequest(data) {
+  return request({
+    url: '/key/authorize',
+    method: 'POST',
+    data
+  })
+}
+
+// 取消授权管理员
+export function unauthorizeKeyRequest(data) {
+  return request({
+    url: '/key/unauthorize',
+    method: 'POST',
+    data
+  })
+}

components/LockDatetimePicker/LockDatetimePicker.vue

@@ -8,7 +8,8 @@
     </view>
     <up-datetime-picker
       :filter="filter"
-      itemHeight="60"
+      :itemHeight="70"
+      :visibleItemCount="5"
       :minDate="minDate"
       :show="show"
       v-model="time"

components/ModalInput/ModalInput.vue

@@ -4,12 +4,20 @@
       <view class="bg-#f3f3f3 rounded-2xl">
         <view class="py-4 text-center font-bold text-lg">{{ title }}</view>
         <view class="px-4">
-          <input
+          <up-input
-            class="bg-white border-none outline-none rounded-md h-80 w-450 text-base px-4"
+            :customStyle="{
-            placeholder-class="text-base line-height-[80rpx]"
+              padding: '0 28rpx',
-            :focus="show"
+              outline: 'none',
+              width: '450rpx',
+              height: '80rpx',
+              backgroundColor: '#FFFFFF',
+              border: 0
+            }"
+            placeholder-class="!text-base !line-height-[80rpx]"
             :placeholder="placeholder"
-            :value="text"
+            :cursorSpacing="130"
+            border="none"
+            :modelValue="text"
             :maxlength="maxlength"
             :type="type"
             @change="change"
@@ -57,7 +65,7 @@
   }
 
   const change = e => {
-    text.value = e.target.value
+    text.value = e
   }
 
   const confirm = () => {
@@ -72,5 +80,3 @@
     close
   })
 </script>
-
-<style scoped lang="scss"></style>

pages/adminDetail/adminDetail.vue

@@ -49,7 +49,49 @@
         <view class="item-title">操作记录</view>
         <up-icon name="arrow-right"></up-icon>
       </view>
+      <view class="m-4 flex items-center justify-between text-base">
+        <view :class="[info.keyStatus === 110405 ? 'text-#63b8af' : 'text-red']" @click="freeze">{{
+          info.keyStatus === 110405 ? '解冻' : '冻结'
+        }}</view>
+        <view :class="[info.keyRight === 1 ? 'text-red' : 'text-#63b8af']" @click="authorize">{{
+          info.keyRight === 1 ? '取消授权管理员' : '授权管理员'
+        }}</view>
+      </view>
       <view class="button" @click="showModal = true">删除</view>
+      <up-modal
+        :show="showModalFreeze"
+        title="提示"
+        :showCancelButton="true"
+        width="600rpx"
+        @cancel="cancelModalFreeze"
+        @confirm="confirmModalFreeze"
+      >
+        <view v-if="info.keyRight === 1" class="slot-content" @click="changeRadioFreeze">
+          <view style="display: flex; align-items: center">
+            <radio :checked="checkedFreeze"></radio>
+            <view>同时{{ info.keyStatus === 110405 ? '解冻' : '冻结' }}其发送的钥匙</view>
+          </view>
+        </view>
+        <view v-else class="slot-content">
+          <view>{{ info.keyStatus === 110405 ? '取消冻结' : '冻结' }}会在用户APP连网后生效</view>
+        </view>
+      </up-modal>
+      <up-modal
+        :show="showModalAuthorize"
+        title="提示"
+        :showCancelButton="true"
+        width="600rpx"
+        @cancel="cancelModalAuthorize"
+        @confirm="confirmModalAuthorize"
+      >
+        <view class="slot-content">
+          <view>{{
+            info.keyRight === 1
+              ? '取消授权会在用户APP连网后生效'
+              : '授权用户拥有管理员的大部分权限，比如发送要是、发送密码'
+          }}</view>
+        </view>
+      </up-modal>
       <ModalInput
         ref="modalInput"
         title="请输入姓名"
@@ -82,8 +124,12 @@
   import { onLoad } from '@dcloudio/uni-app'
   import { timeFormat } from 'uview-plus'
   import {
+    authorizeKeyRequest,
     deleteKeyRequest,
+    freezeKeyRequest,
     getKeyRequest,
+    unauthorizeKeyRequest,
+    unfreezeKeyRequest,
     updateKeyDateRequest,
     updateKeyNameRequest
   } from '@/api/key'
@@ -99,7 +145,10 @@
   const info = ref(null)
 
   const showModal = ref(false)
+  const showModalFreeze = ref(false)
+  const showModalAuthorize = ref(false)
   const checked = ref(false)
+  const checkedFreeze = ref(false)
 
   const modalInput = ref(null)
 
@@ -137,6 +186,83 @@
     }
   }
 
+  const freeze = async () => {
+    showModalFreeze.value = true
+  }
+
+  const authorize = async () => {
+    showModalAuthorize.value = true
+  }
+
+  const cancelModalFreeze = () => {
+    showModalFreeze.value = false
+    checkedFreeze.value = false
+  }
+
+  const cancelModalAuthorize = () => {
+    showModalAuthorize.value = false
+  }
+
+  const changeRadioFreeze = () => {
+    checkedFreeze.value = !checkedFreeze.value
+  }
+
+  const confirmModalFreeze = async () => {
+    uni.showLoading({
+      title: '更新中',
+      mask: true
+    })
+    const { code, message } =
+      info.value.keyStatus === 110405
+        ? await unfreezeKeyRequest({
+            keyId: info.value.keyId,
+            includeUnderlings: checkedFreeze.value ? 1 : 0
+          })
+        : await freezeKeyRequest({
+            keyId: info.value.keyId,
+            includeUnderlings: checkedFreeze.value ? 1 : 0
+          })
+    if (code === 0) {
+      showModalFreeze.value = false
+      eventChannel.emit('refresherList', {})
+      uni.hideLoading()
+      $basic.backAndToast(info.value.keyStatus === 110405 ? '解冻成功' : '冻结成功')
+    } else {
+      uni.hideLoading()
+      uni.showToast({
+        title: message,
+        icon: 'none'
+      })
+    }
+  }
+
+  const confirmModalAuthorize = async () => {
+    uni.showLoading({
+      title: '更新中',
+      mask: true
+    })
+    const { code, message } =
+      info.value.keyRight === 1
+        ? await unauthorizeKeyRequest({
+            keyId: info.value.keyId
+          })
+        : await authorizeKeyRequest({
+            keyId: info.value.keyId
+          })
+    if (code === 0) {
+      showModalAuthorize.value = false
+      eventChannel.emit('refresherList', {})
+      uni.hideLoading()
+      $basic.backAndToast(info.value.keyRight === 1 ? '取消授权成功' : '授权成功')
+    } else {
+      uni.hideLoading()
+      uni.showToast({
+        title: message,
+        icon: 'none'
+      })
+    }
+  }
+
   onLoad(options => {
     if (options.info) {
       info.value = JSON.parse(options.info)

pages/cycleDate/cycleDate.vue

@@ -88,11 +88,12 @@
     >
     <up-datetime-picker
       :hasInput="false"
+      :itemHeight="70"
+      :visibleItemCount="5"
       :show="showStartDate"
       v-model="defaultStartDate"
       mode="date"
       closeOnClickOverlay
-      :visibleItemCount="5"
       @close="showStartDate = false"
       @confirm="confirmDate('start', $event)"
       @cancel="showStartDate = false"
@@ -100,10 +101,11 @@
     <up-datetime-picker
       :hasInput="false"
       :show="showEndDate"
+      :itemHeight="70"
+      :visibleItemCount="5"
       v-model="defaultEndDate"
       mode="date"
       closeOnClickOverlay
-      :visibleItemCount="5"
       @close="showEndDate = false"
       @confirm="confirmDate('end', $event)"
       @cancel="showEndDate = false"
@@ -111,10 +113,11 @@
     <up-datetime-picker
       :hasInput="false"
       :show="showStartTime"
+      :itemHeight="70"
+      :visibleItemCount="5"
       v-model="defaultStartTime"
       mode="time"
       closeOnClickOverlay
-      :visibleItemCount="5"
       @close="showStartTime = false"
       @confirm="confirmTime('start', $event)"
       @cancel="showStartTime = false"
@@ -122,10 +125,11 @@
     <up-datetime-picker
       :hasInput="false"
       :show="showEndTime"
+      :itemHeight="70"
+      :visibleItemCount="5"
       v-model="defaultEndTime"
       mode="time"
       closeOnClickOverlay
-      :visibleItemCount="5"
       @close="showEndTime = false"
       @confirm="confirmTime('end', $event)"
       @cancel="showEndTime = false"

pages/keyDetail/keyDetail.vue

@@ -89,6 +89,18 @@
       <view class="item-title">操作记录</view>
       <up-icon name="arrow-right"></up-icon>
     </view>
+    <view class="m-4 flex items-center justify-between text-base">
+      <view
+        :class="[$lock.currentKeyInfo.keyStatus === 110405 ? 'text-#63b8af' : 'text-red']"
+        @click="freeze"
+        >{{ $lock.currentKeyInfo.keyStatus === 110405 ? '解冻' : '冻结' }}</view
+      >
+      <view
+        :class="[$lock.currentKeyInfo.keyRight === 1 ? 'text-red' : 'text-#63b8af']"
+        @click="authorize"
+        >{{ $lock.currentKeyInfo.keyRight === 1 ? '取消授权管理员' : '授权管理员' }}</view
+      >
+    </view>
     <view class="button" @click="deleteKey">删除</view>
     <up-modal
       :show="showModal"
@@ -105,6 +117,50 @@
         </view>
       </view>
     </up-modal>
+    <up-modal
+      :show="showModalFreeze"
+      title="提示"
+      :showCancelButton="true"
+      width="600rpx"
+      @cancel="cancelModalFreeze"
+      @confirm="confirmModalFreeze"
+    >
+      <view
+        v-if="$lock.currentKeyInfo.keyRight === 1"
+        class="slot-content"
+        @click="changeRadioFreeze"
+      >
+        <view style="display: flex; align-items: center">
+          <radio :checked="checkedFreeze"></radio>
+          <view
+            >同时{{ $lock.currentKeyInfo.keyStatus === 110405 ? '解冻' : '冻结' }}其发送的钥匙</view
+          >
+        </view>
+      </view>
+      <view v-else class="slot-content">
+        <view
+          >{{
+            $lock.currentKeyInfo.keyStatus === 110405 ? '取消冻结' : '冻结'
+          }}会在用户APP连网后生效</view
+        >
+      </view>
+    </up-modal>
+    <up-modal
+      :show="showModalAuthorize"
+      title="提示"
+      :showCancelButton="true"
+      width="600rpx"
+      @cancel="cancelModalAuthorize"
+      @confirm="confirmModalAuthorize"
+    >
+      <view class="slot-content">
+        <view>{{
+          $lock.currentKeyInfo.keyRight === 1
+            ? '取消授权会在用户APP连网后生效'
+            : '授权用户拥有管理员的大部分权限，比如发送要是、发送密码'
+        }}</view>
+      </view>
+    </up-modal>
     <ModalInput
       ref="modalInput"
       title="请输入姓名"
@@ -121,8 +177,12 @@
   import { ref } from 'vue'
   import { useLockStore } from '@/stores/lock'
   import {
+    authorizeKeyRequest,
     deleteKeyRequest,
+    freezeKeyRequest,
     getKeyRequest,
+    unauthorizeKeyRequest,
+    unfreezeKeyRequest,
     updateKeyDateRequest,
     updateKeyNameRequest
   } from '@/api/key'
@@ -134,12 +194,23 @@
   const $bluetooth = useBluetoothStore()
 
   const showModal = ref(false)
+  const showModalFreeze = ref(false)
+  const showModalAuthorize = ref(false)
   const checked = ref(false)
+  const checkedFreeze = ref(false)
 
   const modalInput = ref(null)
 
   const pending = ref(false)
 
+  const freeze = async () => {
+    showModalFreeze.value = true
+  }
+
+  const authorize = async () => {
+    showModalAuthorize.value = true
+  }
+
   const changeManageSelf = async () => {
     if (pending.value) return
     pending.value = true
@@ -264,10 +335,23 @@
     checked.value = false
   }
 
+  const cancelModalFreeze = () => {
+    showModalFreeze.value = false
+    checkedFreeze.value = false
+  }
+
+  const cancelModalAuthorize = () => {
+    showModalAuthorize.value = false
+  }
+
   const changeRadio = () => {
     checked.value = !checked.value
   }
 
+  const changeRadioFreeze = () => {
+    checkedFreeze.value = !checkedFreeze.value
+  }
+
   const confirmModal = async () => {
     uni.showLoading({
       title: '删除中',
@@ -295,6 +379,70 @@
     }
   }
 
+  const confirmModalFreeze = async () => {
+    uni.showLoading({
+      title: '更新中',
+      mask: true
+    })
+    const { code, message } =
+      $lock.currentKeyInfo.keyStatus === 110405
+        ? await unfreezeKeyRequest({
+            keyId: $lock.currentKeyInfo.keyId,
+            includeUnderlings: checkedFreeze.value ? 1 : 0
+          })
+        : await freezeKeyRequest({
+            keyId: $lock.currentKeyInfo.keyId,
+            includeUnderlings: checkedFreeze.value ? 1 : 0
+          })
+    if (code === 0) {
+      showModalFreeze.value = false
+      $lock.updateKeySearch({
+        ...$lock.keySearch,
+        pageNo: 1
+      })
+      $lock.getKeyList($lock.keySearch)
+      uni.hideLoading()
+      $basic.backAndToast($lock.currentKeyInfo.keyStatus === 110405 ? '解冻成功' : '冻结成功')
+    } else {
+      uni.hideLoading()
+      uni.showToast({
+        title: message,
+        icon: 'none'
+      })
+    }
+  }
+
+  const confirmModalAuthorize = async () => {
+    uni.showLoading({
+      title: '更新中',
+      mask: true
+    })
+    const { code, message } =
+      $lock.currentKeyInfo.keyRight === 1
+        ? await unauthorizeKeyRequest({
+            keyId: $lock.currentKeyInfo.keyId
+          })
+        : await authorizeKeyRequest({
+            keyId: $lock.currentKeyInfo.keyId
+          })
+    if (code === 0) {
+      showModalAuthorize.value = false
+      $lock.updateKeySearch({
+        ...$lock.keySearch,
+        pageNo: 1
+      })
+      $lock.getKeyList($lock.keySearch)
+      uni.hideLoading()
+      $basic.backAndToast($lock.currentKeyInfo.keyRight === 1 ? '取消授权成功' : '授权成功')
+    } else {
+      uni.hideLoading()
+      uni.showToast({
+        title: message,
+        icon: 'none'
+      })
+    }
+  }
+
   const deleteKey = async () => {
     if ($lock.currentKeyInfo.keyRight === 1) {
       showModal.value = true

pages/temporaryDate/temporaryDate.vue

@@ -47,6 +47,7 @@
       v-model="defaultStartDate"
       mode="datetime"
       closeOnClickOverlay
+      :itemHeight="70"
       :visibleItemCount="5"
       @close="showStartDate = false"
       @confirm="confirmDate('start', $event)"
@@ -58,6 +59,7 @@
       v-model="defaultEndDate"
       mode="datetime"
       closeOnClickOverlay
+      :itemHeight="70"
       :visibleItemCount="5"
       @close="showEndDate = false"
       @confirm="confirmDate('end', $event)"

uni.scss

@@ -77,7 +77,3 @@ $uni-color-subtitle: #555555; // 二级标题颜色
 $uni-font-size-subtitle:26px;
 $uni-color-paragraph: #3F536E; // 文章段落颜色
 $uni-font-size-paragraph:15px;
-
-.u-picker__view {
-    height: 500rpx !important;
-}