From 4e23c6f99a6330278cc82c25c5f9dff974de231b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Thu, 26 Sep 2024 17:40:44 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E5=92=8C=E7=94=B5=E5=AD=90=E9=92=A5=E5=8C=99=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                           |  2 +-
 pages/createKey/createKey.vue           | 14 +++++++-------
 pages/createPassword/createPassword.vue |  9 ++++-----
 pages/keyDetail/keyDetail.vue           |  4 ++--
 pages/passwordDetail/passwordDetail.vue |  4 ++--
 5 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/manifest.json b/manifest.json
index f3f27e4..b428330 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
     "appid" : "__UNI__933D519",
     "description" : "",
     "versionName" : "1.0.2",
-    "versionCode" : "19",
+    "versionCode" : "20",
     "transformPx" : false,
     /* 小程序特有相关 */
     "mp-weixin" : {
diff --git a/pages/createKey/createKey.vue b/pages/createKey/createKey.vue
index 3faf3b0..4065e2c 100644
--- a/pages/createKey/createKey.vue
+++ b/pages/createKey/createKey.vue
@@ -10,17 +10,17 @@
             :list="tabs" :autoplay="false"
             :circular="true" :current="currnetIndex" @change="changeSwiper">
       <swiper-item>
-        <LockInput :value="permanentAccount" title="接收者账号" placeholder="请输入手机号或邮箱"
+        <LockInput :value="permanentAccount" title="接收者" placeholder="请输入手机号或邮箱"
                    @changeInput="changePermanentAccountInput"></LockInput>
-        <LockInput :value="permanentName" title="钥匙名称" placeholder="请输入钥匙名称"
+        <LockInput :value="permanentName" title="姓名" placeholder="请输入姓名"
                    @changeInput="changePermanentNmaeInput"></LockInput>
         <view class="text">接收者可使用此小程序开关锁</view>
-        <view class="button" @click="createKey('permanent')">发送钥匙</view>
+        <view class="button" @click="createKey('permanent')">发送</view>
       </swiper-item>
       <swiper-item :style="{height: deviceInfo.windowHeight - 44 + 'px'}">
-        <LockInput :value="temporaryAccount" title="接收者账号" placeholder="请输入手机号或邮箱"
+        <LockInput :value="temporaryAccount" title="接收者" placeholder="请输入手机号或邮箱"
                    @changeInput="changeTemporaryAccountInput"></LockInput>
-        <LockInput :value="temporaryName" title="钥匙名称" placeholder="请输入钥匙名称"
+        <LockInput :value="temporaryName" title="姓名" placeholder="请输入姓名"
                    @changeInput="changeTemporaryNameInput"></LockInput>
         <view style="margin-top: 20rpx">
           <LockDatetimePicker title="生效时间" :value="temporaryValidTime" :minDate="minDate"
@@ -29,7 +29,7 @@
                               placeholder="请选择失效时间" @changeTime="changeTemporaryInvalidTime"></LockDatetimePicker>
         </view>
         <view class="text">接收者在有效期内可以不限次数使用</view>
-        <view class="button" @click="createKey('temporary')">发送钥匙</view>
+        <view class="button" @click="createKey('temporary')">发送</view>
       </swiper-item>
     </swiper>
   </view>
@@ -77,7 +77,7 @@ export default {
   },
   async onLoad () {
     this.deviceInfo = await this.getDeviceInfo()
-    this.temporaryInvalidTime = this.setTime()
+    // this.temporaryInvalidTime = this.setTime()
   },
   methods: {
     ...mapActions(useBasicStore, ['getDeviceInfo', 'backAndToast', 'getNetworkType']),
diff --git a/pages/createPassword/createPassword.vue b/pages/createPassword/createPassword.vue
index 2a87160..0327349 100644
--- a/pages/createPassword/createPassword.vue
+++ b/pages/createPassword/createPassword.vue
@@ -10,13 +10,13 @@
             :list="tabs" :autoplay="false"
             :circular="true" :current="currnetIndex" @change="changeSwiper">
       <swiper-item>
-        <LockInput :value="permanentName" title="名称" placeholder="给密码命名"
+        <LockInput :value="permanentName" title="姓名" placeholder="请给密码命名"
                    @changeInput="changePermanentInput"></LockInput>
         <view class="text">{{ text }}</view>
         <view class="button" @click="createPassword('permanent')">获取密码</view>
       </swiper-item>
       <swiper-item :style="{height: deviceInfo.windowHeight - 44 + 'px'}">
-        <LockInput :value="temporaryName" title="名称" placeholder="给密码命名"
+        <LockInput :value="temporaryName" title="名称" placeholder="请给密码命名"
                    @changeInput="changeTemporaryInput"></LockInput>
         <view style="margin-top: 20rpx">
           <LockDatetimePicker title="失效时间" :value="temporaryTime" :minDate="minDate" type="datehour"
@@ -54,7 +54,7 @@ export default {
       currnetIndex: 0,
       deviceInfo: null,
       pending: false,
-      text: '密码生成后，请在当日23：59前使用一次进行激活，否则过点后未激活则失效。密码激活后，有效期内不限次数使用。'
+      text: '密码生成后，请在当日23：59前使用一次进行激活，否则过0点后未激活则失效。密码激活后，有效期内不限次数使用。'
     }
   },
   components: {
@@ -77,7 +77,7 @@ export default {
     getNextFullHour() {
       const now = new Date()
       const currentHour = now.getHours()
-      now.setHours(currentHour + 1);
+      now.setHours(currentHour);
       now.setMinutes(0);
       now.setSeconds(0);
       now.setMilliseconds(0);
@@ -87,7 +87,6 @@ export default {
     setTime() {
       const now = new Date()
       now.setMinutes(0, 0, 0)
-      now.setDate(now.getDate() + 1)
 
       return now.getTime()
     },
diff --git a/pages/keyDetail/keyDetail.vue b/pages/keyDetail/keyDetail.vue
index 2da44aa..17b2aec 100644
--- a/pages/keyDetail/keyDetail.vue
+++ b/pages/keyDetail/keyDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <view>
     <view class="item">
-      <view class="item-title" style="width: 350rpx">名称</view>
+      <view class="item-title" style="width: 350rpx">姓名</view>
       <view class="item-content">{{ currentKeyInfo.keyName }}</view>
     </view>
     <view class="item" style="margin-top: 2rpx">
@@ -39,7 +39,7 @@
       <view class="item-title">发送时间</view>
       <view class="item-content">{{ timeFormat(currentKeyInfo.sendDate, 'yyyy-mm-dd h:M') }}</view>
     </view>
-    <view class="button" @click="deleteKey">删除钥匙</view>
+    <view class="button" @click="deleteKey">删除</view>
     <up-modal :show="showModal"  title="是否删除授权管理员钥匙？" :showCancelButton="true" width="600rpx" @cancel="cancelModal"
               @confirm="confirmModal">
       <view class="slot-content" @click="changeRadio">
diff --git a/pages/passwordDetail/passwordDetail.vue b/pages/passwordDetail/passwordDetail.vue
index f2d4002..8656593 100644
--- a/pages/passwordDetail/passwordDetail.vue
+++ b/pages/passwordDetail/passwordDetail.vue
@@ -5,7 +5,7 @@
       <view class="item-content">{{ currentPasswordInfo.keyboardPwd }}</view>
     </view>
     <view class="item" style="margin-top: 2rpx">
-      <view class="item-title">名称</view>
+      <view class="item-title">姓名</view>
       <view class="item-content">{{ currentPasswordInfo.keyboardPwdName }}</view>
     </view>
     <view class="item" style="margin-top: 2rpx">
@@ -28,7 +28,7 @@
       <view class="item-content">{{ timeFormat(currentPasswordInfo.sendDate, 'yyyy-mm-dd h:M') }}</view>
     </view>
     <view class="tips">密码生成后，请在当日23：59前使用一次进行激活，否则过0点后未激活则失效。</view>
-    <view class="button" @click="deletePassword">删除密码</view>
+    <view class="button" @click="deletePassword">删除</view>
   </view>
 </template>