uview-plus 3.2.15 → 3.2.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/changelog.md
CHANGED
|
@@ -104,7 +104,7 @@
|
|
|
104
104
|
},
|
|
105
105
|
// 保存时间戳，为了防止倒计时尚未结束，H5刷新或者各端的右上角返回上一页再进来
|
|
106
106
|
setTimeToStorage() {
|
|
107
|
-
if(!this.keepRunning) return
|
|
107
|
+
if(!this.keepRunning || !this.timer) return
|
|
108
108
|
// 记录当前的时间戳，为了下次进入页面，如果还在倒计时内的话，继续倒计时
|
|
109
109
|
// 倒计时尚未结束，结果大于0；倒计时已经开始，就会小于初始值，如果等于初始值，说明没有开始倒计时，无需处理
|
|
110
110
|
if(this.secNum > 0 && this.secNum <= this.seconds) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<view class="u-qrcode">
|
|
3
|
-
<canvas class="u-qrcode__canvas" :canvas-id="cid" :style="{ width: size + unit, height: size + unit }" />
|
|
3
|
+
<canvas class="u-qrcode__canvas" :id="cid" :canvas-id="cid" :style="{ width: size + unit, height: size + unit }" />
|
|
4
4
|
<image v-show="show" :src="result" :style="{ width: size + unit, height: size + unit }" />
|
|
5
5
|
</view>
|
|
6
6
|
</template>
|
|
@@ -142,9 +142,7 @@
|
|
|
142
142
|
return index => {
|
|
143
143
|
const style = {}
|
|
144
144
|
// 取当期是否激活的样式
|
|
145
|
-
const customeStyle = index === this.innerCurrent ? addStyle(this.activeStyle) :
|
|
146
|
-
.addStyle(
|
|
147
|
-
this.inactiveStyle)
|
|
145
|
+
const customeStyle = index === this.innerCurrent ? addStyle(this.activeStyle) : addStyle(this.inactiveStyle)
|
|
148
146
|
// 如果当前菜单被禁用，则加上对应颜色，需要在此做处理，是因为nvue下，无法在style样式中通过!import覆盖标签的内联样式
|
|
149
147
|
if (this.list[index].disabled) {
|
|
150
148
|
style.color = '#c8c9cc'
|
|
@@ -339,7 +337,7 @@
|
|
|
339
337
|
&__text {
|
|
340
338
|
font-size: 15px;
|
|
341
339
|
color: $u-content-color;
|
|
342
|
-
white-space: nowrap;
|
|
340
|
+
white-space: nowrap !important;
|
|
343
341
|
|
|
344
342
|
&--disabled {
|
|
345
343
|
color: $u-disabled-color !important;
|