fix：修复密码和电子钥匙文案与时间范围
This commit is contained in:
范鹏
parent
87ee56869c
commit
b309a53281
@ -6,10 +6,10 @@
|
||||
{{ timeFormat(time, 'yyyy-mm-dd h:M') }}
|
||||
</view>
|
||||
</view>
|
||||
<up-datetime-picker :filter="filter" itemHeight="60" :minDate="minDate" :title="placeholder" :show="show"
|
||||
v-model="time"
|
||||
<up-datetime-picker :filter="filter" itemHeight="60" :minDate="minDate" :show="show"
|
||||
v-model="time" :formatter="formatter" :maxDate="maxDate"
|
||||
mode="datetime" @confirm="confirm" :closeOnClickOverlay="true"
|
||||
@close="close"></up-datetime-picker>
|
||||
@close="close" @cancel="close"></up-datetime-picker>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@ -22,7 +22,7 @@ export default {
|
||||
title: String,
|
||||
value: Number,
|
||||
minDate: Number,
|
||||
placeholder: String,
|
||||
maxDate: Number,
|
||||
type: {
|
||||
type: String,
|
||||
default: 'datetime'
|
||||
@ -39,6 +39,24 @@ export default {
|
||||
},
|
||||
methods: {
|
||||
timeFormat,
|
||||
formatter(type, value) {
|
||||
if (type === 'year') {
|
||||
return `${value}年`;
|
||||
}
|
||||
if (type === 'month') {
|
||||
return `${value}月`;
|
||||
}
|
||||
if (type === 'day') {
|
||||
return `${value}日`;
|
||||
}
|
||||
if (type === 'hour') {
|
||||
return `${value}时`;
|
||||
}
|
||||
if (type === 'minute') {
|
||||
return `${value}分`;
|
||||
}
|
||||
return value;
|
||||
},
|
||||
filter(mode, options) {
|
||||
if (mode === 'minute' && this.type === 'datehour') {
|
||||
return options.filter((option) => option === '00')
|
||||
|
||||
@ -14,7 +14,8 @@
|
||||
@changeInput="changePermanentAccountInput"></LockInput>
|
||||
<LockInput :value="permanentName" title="姓名" placeholder="请输入姓名"
|
||||
@changeInput="changePermanentNmaeInput"></LockInput>
|
||||
<view class="text">接收者可使用此小程序开关锁</view>
|
||||
<view class="text" style="margin-top: 40rpx;">接收者可使用此小程序开关锁</view>
|
||||
<view class="text" style="margin-bottom: 50rpx;">小程序暂不支持邮箱登录，若接收者账号为邮箱可先使用星星锁APP登录，绑定手机号后可使用小程序登录</view>
|
||||
<view class="button" @click="createKey('permanent')">发送</view>
|
||||
</swiper-item>
|
||||
<swiper-item :style="{height: deviceInfo.windowHeight - 44 + 'px'}">
|
||||
@ -24,11 +25,12 @@
|
||||
@changeInput="changeTemporaryNameInput"></LockInput>
|
||||
<view style="margin-top: 20rpx">
|
||||
<LockDatetimePicker title="生效时间" :value="temporaryValidTime" :minDate="minDate"
|
||||
placeholder="请选择失效时间" @changeTime="changeTemporaryValidTime"></LockDatetimePicker>
|
||||
@changeTime="changeTemporaryValidTime" :maxDate="maxDate"></LockDatetimePicker>
|
||||
<LockDatetimePicker title="失效时间" :value="temporaryInvalidTime" :minDate="minDate"
|
||||
placeholder="请选择失效时间" @changeTime="changeTemporaryInvalidTime"></LockDatetimePicker>
|
||||
@changeTime="changeTemporaryInvalidTime" :maxDate="maxDate"></LockDatetimePicker>
|
||||
</view>
|
||||
<view class="text">接收者在有效期内可以不限次数使用</view>
|
||||
<view class="text" style="margin-top: 40rpx;">接收者在有效期内可以不限次数使用</view>
|
||||
<view class="text" style="margin-bottom: 50rpx;">小程序暂不支持邮箱登录，若接收者账号为邮箱可先使用星星锁APP登录，绑定手机号后可使用小程序登录</view>
|
||||
<view class="button" @click="createKey('temporary')">发送</view>
|
||||
</swiper-item>
|
||||
</swiper>
|
||||
@ -62,6 +64,7 @@ export default {
|
||||
temporaryValidTime: Number(new Date()),
|
||||
temporaryInvalidTime: Number(new Date()),
|
||||
minDate: Number(new Date()),
|
||||
maxDate: Number(4133951940000),
|
||||
currnetIndex: 0,
|
||||
deviceInfo: null,
|
||||
pending: false
|
||||
@ -212,8 +215,6 @@ page {
|
||||
}
|
||||
|
||||
.text {
|
||||
margin-top: 40rpx;
|
||||
margin-bottom: 50rpx;
|
||||
color: #262626;
|
||||
font-size: 26rpx;
|
||||
padding: 0 32rpx;
|
||||
|
||||
@ -16,11 +16,11 @@
|
||||
<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"
|
||||
placeholder="请选择失效时间" @changeTime="changeTemporaryTime"></LockDatetimePicker>
|
||||
<LockDatetimePicker title="失效时间" :value="temporaryTime" :minDate="minDate" :maxDate="maxDate" type="datehour"
|
||||
@changeTime="changeTemporaryTime"></LockDatetimePicker>
|
||||
</view>
|
||||
<view class="text">{{ text }}</view>
|
||||
<view class="button" @click="createPassword('temporary')">获取密码</view>
|
||||
@ -51,6 +51,7 @@ export default {
|
||||
temporaryName: '',
|
||||
temporaryTime: Number(new Date()),
|
||||
minDate: Number(new Date()),
|
||||
maxDate: Number(4133951940000),
|
||||
currnetIndex: 0,
|
||||
deviceInfo: null,
|
||||
pending: false,
|
||||
@ -69,6 +70,7 @@ export default {
|
||||
this.deviceInfo = await this.getDeviceInfo()
|
||||
this.temporaryTime = this.setTime()
|
||||
this.minDate = Number(this.getNextFullHour())
|
||||
this.maxDate = Number(this.getFutureTimestamp())
|
||||
},
|
||||
methods: {
|
||||
...mapActions(useBasicStore, ['getDeviceInfo', 'backAndToast', 'getNetworkType']),
|
||||
@ -84,6 +86,17 @@ export default {
|
||||
|
||||
return now;
|
||||
},
|
||||
getFutureTimestamp() {
|
||||
const currentDate = new Date();
|
||||
|
||||
const year = currentDate.getFullYear();
|
||||
const month = currentDate.getMonth();
|
||||
const day = currentDate.getDate();
|
||||
|
||||
const futureDate = new Date(year + 3, month, day, 23, 0, 0);
|
||||
|
||||
return futureDate.getTime();
|
||||
},
|
||||
setTime() {
|
||||
const now = new Date()
|
||||
now.setMinutes(0, 0, 0)
|
||||
|
||||
@ -27,7 +27,6 @@
|
||||
<view class="item-title">发送时间</view>
|
||||
<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>
|
||||
</template>
|
||||
|
||||
@ -213,7 +213,7 @@ export const useLockStore = defineStore('lock', {
|
||||
} else if(data.list[i].keyboardPwdType === 14) {
|
||||
text = '周日'
|
||||
}
|
||||
data.list[i].timeText = `${text} ${data.list[i].hoursStart}:00-${data.list[i].hoursEnd}:00 循环`
|
||||
data.list[i].timeText = `${text} ${data.list[i].hoursStart}:00-${data.list[i].hoursEnd}:00`
|
||||
}
|
||||
if(data.list[i].isCustom === 1) {
|
||||
data.list[i].timeText += ' 自定义'
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user