Commit 2cdfa7f8 authored by nature's avatar nature

使用vw代替rem

parent 1744227b
...@@ -22,8 +22,9 @@ Vue.use(NumberKeyboard) ...@@ -22,8 +22,9 @@ Vue.use(NumberKeyboard)
* 锁屏函数 超过10s后自动解屏用于防止屏幕锁死 * 锁屏函数 超过10s后自动解屏用于防止屏幕锁死
* 自动截屏成弹出错误提示框 * 自动截屏成弹出错误提示框
* @param content 锁屏内容 * @param content 锁屏内容
* @param timeout
*/ */
export function showLoading (content = '') { export function showLoading (content = '', timeout = 10000) {
let vm = this let vm = this
Vue.$vux.loading.show({ Vue.$vux.loading.show({
text: content || 'Loading', text: content || 'Loading',
...@@ -43,7 +44,7 @@ export function showLoading (content = '') { ...@@ -43,7 +44,7 @@ export function showLoading (content = '') {
position: 'middle', position: 'middle',
}) */ }) */
} }
}, 10000) }, timeout)
} }
/** /**
......
...@@ -3263,3 +3263,4 @@ ...@@ -3263,3 +3263,4 @@
animation-name: slideOutUp; animation-name: slideOutUp;
} }
...@@ -33,6 +33,9 @@ ...@@ -33,6 +33,9 @@
.weui-mask { .weui-mask {
background: rgba(0, 0, 0, 0.3) !important; background: rgba(0, 0, 0, 0.3) !important;
} }
.weui-toast .weui-loading{
animation: vue-loading 1s steps(12, end) infinite !important;
}
.weui-loading_toast .weui-toast__content { .weui-loading_toast .weui-toast__content {
margin-top: 7px !important; margin-top: 7px !important;
...@@ -485,5 +488,23 @@ ...@@ -485,5 +488,23 @@
} }
} }
@-webkit-keyframes vue-loading {
0% {
transform: rotate3d(0, 0, 1, 0deg);
}
100% {
transform: rotate3d(0, 0, 1, 360deg);
}
}
@keyframes vue-loading {
0% {
transform: rotate3d(0, 0, 1, 0deg);
}
100% {
transform: rotate3d(0, 0, 1, 360deg);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment