|
@@ -238,16 +238,16 @@ export const format_milliseconds = (milliseconds: number) => {
|
|
|
* @param ms
|
|
|
*/
|
|
|
export const millisecondsToMinutesAndSeconds = (milliseconds: number) => {
|
|
|
- let seconds = Math.floor(milliseconds / 1000); // 先将毫秒转换为秒
|
|
|
- let minutes = Math.floor(seconds / 60); // 将秒转换为分钟
|
|
|
- seconds = seconds % 60; // 计算剩余的秒数
|
|
|
+ let seconds = Math.floor(milliseconds / 1000) // 先将毫秒转换为秒
|
|
|
+ const minutes = Math.floor(seconds / 60) // 将秒转换为分钟
|
|
|
+ seconds = seconds % 60 // 计算剩余的秒数
|
|
|
|
|
|
// 如果不到一分钟,则只显示秒
|
|
|
if (minutes === 0) {
|
|
|
- return seconds + '秒';
|
|
|
+ return seconds + '秒'
|
|
|
} else {
|
|
|
// 否则显示分钟和秒
|
|
|
- return minutes + '分钟' + (seconds > 0 ? seconds + '秒' : '');
|
|
|
+ return minutes + '分钟' + (seconds > 0 ? seconds + '秒' : '')
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -303,5 +303,7 @@ export const ImageArr = [
|
|
|
|
|
|
// 判断是否为小屏 同 theme.screens.max-m width
|
|
|
export const isMaxM = () => {
|
|
|
- return window.innerWidth <= 750
|
|
|
+ const userAgent = /iPhone|iPad|iPod|Android/i.test(navigator.userAgent)
|
|
|
+ const screenCheck = window.matchMedia('only screen and (max-width: 750px)').matches
|
|
|
+ return userAgent || screenCheck // window.innerWidth <= 750
|
|
|
}
|