Skip to content

Commit cea42bb

Browse files
mehaotianmehaotian
committed
fix(uni-ui): 修改不正确条件编译等 bug
1 parent 465740d commit cea42bb

File tree

42 files changed

+783
-140
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+783
-140
lines changed

‎components/uni-calendar/uni-calendar.vue‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -296,11 +296,9 @@
296296
// this.multiple = this.multiple === 0 ? 1 : 0;
297297
298298
if (this.multiple === 0) {
299-
console.log('开始选择');
300299
this.multipleDates.begin = time
301300
this.multiple = 1
302301
} else if (this.multiple === 1) {
303-
console.log('已经选择');
304302
this.multiple = 2
305303
if (this.multipleDates.data) {
306304
this.multipleDates.data = []
@@ -315,7 +313,6 @@
315313
this.multipleDates.begin = time
316314
}
317315
} else {
318-
console.log('再次选择');
319316
this.multiple = 0
320317
this.multipleDates.data = []
321318
this.multipleDates.begin = ''
@@ -409,7 +406,6 @@
409406
410407
// 结束日期
411408
if (year === Number(eYear) && month === Number(eMonth) && i === Number(eDate)) {
412-
// console.log(eYear, eMonth, eDate, 'end');
413409
multipleEnd = true
414410
}
415411
@@ -520,7 +516,6 @@
520516
}
521517
},
522518
geDateAll(begin, end) {
523-
console.log(begin, end);
524519
var arr = []
525520
var ab = begin.split('-')
526521
var ae = end.split('-')
@@ -530,13 +525,10 @@
530525
de.setFullYear(ae[0], ae[1] - 1, ae[2])
531526
var unixDb = db.getTime() - 24 * 60 * 60 * 1000
532527
var unixDe = de.getTime() - 24 * 60 * 60 * 1000
533-
console.log(unixDb, unixDe);
534528
for (var k = unixDb; k <= unixDe;) {
535529
k = k + 24 * 60 * 60 * 1000
536-
console.log(k);
537530
arr.push(this.getDate(new Date(parseInt(k))))
538531
}
539-
console.log(arr);
540532
return arr
541533
}
542534
}

‎components/uni-card/uni-card.vue‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,10 @@
8686
/* #ifndef APP-NVUE */
8787
display: flex;
8888
flex: 1;
89+
box-shadow: 0 0 0 rgba(0, 0, 0, 0);
8990
/* #endif */
90-
margin-left: 24rpx;
91-
margin-right: 24rpx;
91+
margin: 24rpx;
9292
background-color: #ffffff;
93-
box-shadow: 0 0 0 rgba(0, 0, 0, 0);
9493
position: relative;
9594
flex-direction: column;
9695
border-color: #ddd;
@@ -177,7 +176,7 @@
177176
display: flex;
178177
/* #endif */
179178
flex-direction: column;
180-
justify-content: space-between;
179+
justify-content: center;
181180
padding-left: 20rpx;
182181
height: 80rpx;
183182
overflow: hidden;
@@ -187,11 +186,13 @@
187186
188187
.uni-card__title-content-title {
189188
font-size: 30rpx;
189+
line-height: 45rpx;
190190
lines: 1;
191191
}
192192
193193
.uni-card__title-content-extra {
194194
font-size: 26rpx;
195+
line-height: 35rpx;
195196
color: #999;
196197
}
197198
@@ -223,7 +224,14 @@
223224
.uni-card__header-title-text {
224225
font-size: 32rpx;
225226
flex: 1;
227+
/* #ifndef APP-NVUE */
228+
white-space: nowrap;
229+
/* #endif */
230+
/* #ifdef APP-NVUE */
226231
lines: 1;
232+
/* #endif */
233+
overflow: hidden;
234+
text-overflow: ellipsis;
227235
}
228236
229237
.uni-card__header-extra {}
@@ -243,7 +251,6 @@
243251
font-size: 28rpx;
244252
text-align: right;
245253
color: #666;
246-
lines: 1;
247254
248255
}
249256
@@ -278,7 +285,9 @@
278285
border-color: #ddd;
279286
border-style: solid;
280287
border-width: 1px;
288+
/* #ifndef APP-NVUE */
281289
box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.2);
290+
/* #endif */
282291
}
283292
284293
.uni-card--full {

‎components/uni-count-down/uni-count-down.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
</script>
123123
<style scoped>
124124
.uni-countdown {
125-
/* #ifndef APP-PLUS-NVUE */
125+
/* #ifndef APP-NVUE */
126126
display: flex;
127127
/* #endif */
128128
flex-direction: row;
@@ -131,7 +131,7 @@
131131
}
132132
133133
.uni-countdown__splitor {
134-
/* #ifndef APP-PLUS-NVUE */
134+
/* #ifndef APP-NVUE */
135135
display: flex;
136136
/* #endif */
137137
justify-content: center;
@@ -141,7 +141,7 @@
141141
}
142142
143143
.uni-countdown__number {
144-
/* #ifndef APP-PLUS-NVUE */
144+
/* #ifndef APP-NVUE */
145145
display: flex;
146146
/* #endif */
147147
justify-content: center;

‎components/uni-fab/uni-fab.vue‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,9 @@
241241
height: 55px;
242242
background-color: #3c3e49;
243243
border-radius: 50%;
244+
/* #ifndef APP-NVUE */
244245
box-shadow: 0 0 5px 2px rgba(0, 0, 0, 0.2);
246+
/* #endif */
245247
z-index: 11;
246248
}
247249
@@ -263,6 +265,7 @@
263265
264266
.uni-fab__plus {
265267
font-size: 40px;
268+
line-height: 40px;
266269
transform: rotate(0deg);
267270
transition: transform 0.3s;
268271
font-weight: bold;
@@ -280,12 +283,12 @@
280283
flex-direction: row;
281284
border-radius: 50px;
282285
overflow: hidden;
283-
box-shadow: 0 0 5px 2px rgba(0, 0, 0, 0.1);
284286
/* #ifdef APP-NVUE */
285-
transition: width, height 0.2s;
287+
transition: width 0.2s;
286288
/* #endif */
287289
/* #ifndef APP-NVUE */
288290
transition: all 0.2s;
291+
box-shadow: 0 0 5px 2px rgba(0, 0, 0, 0.1);
289292
/* #endif */
290293
width: 55px;
291294
}
@@ -301,6 +304,9 @@
301304
.uni-fab__content--flexDirection {
302305
flex-direction: column;
303306
justify-content: flex-end;
307+
/* #ifdef APP-NVUE */
308+
transition: height 0.2s;
309+
/* #endif */
304310
}
305311
306312
.uni-fab__content--flexDirectionStart {

‎components/uni-fav/uni-fav.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272

7373
<style scoped>
7474
.uni-fav {
75-
/* #ifndef APP-PLUS-NVUE */
75+
/* #ifndef APP-NVUE */
7676
display: flex;
7777
/* #endif */
7878
flex-direction: row;
@@ -90,18 +90,18 @@
9090
}
9191
9292
.uni-fav-star {
93-
/* #ifndef APP-PLUS-NVUE */
93+
/* #ifndef APP-NVUE */
9494
display: flex;
9595
/* #endif */
9696
height: 50rpx;
97-
line-height: 49rpx;
97+
line-height: 48rpx;
9898
margin-right: 5rpx;
9999
align-items: center;
100100
justify-content: center;
101101
}
102102
103103
.uni-fav-text {
104-
/* #ifndef APP-PLUS-NVUE */
104+
/* #ifndef APP-NVUE */
105105
display: flex;
106106
/* #endif */
107107
height: 50rpx;

‎components/uni-indexed-list/uni-indexed-list.vue‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,18 @@
3030
</view>
3131
</template>
3232
<script>
33+
function throttle(func, delay) {
34+
var prev = Date.now();
35+
return function() {
36+
var context = this;
37+
var args = arguments;
38+
var now = Date.now();
39+
if (now - prev >= delay) {
40+
func.apply(context, args);
41+
prev = Date.now();
42+
}
43+
}
44+
}
3345
import uniIcons from '@/components/uni-icons/uni-icons.vue'
3446
export default {
3547
name: 'UniIndexedList',
@@ -120,18 +132,13 @@
120132
}
121133
},
122134
touchMove(e) {
123-
if (this.touchmoveTimeout) {
124-
clearTimeout(this.touchmoveTimeout)
135+
let pageY = e.touches[0].pageY
136+
let index = Math.floor(pageY / this.itemHeight)
137+
let item = this.lists[index]
138+
if (item) {
139+
this.scrollViewId = 'uni-indexed-list-' + item.key
140+
this.touchmoveIndex = index
125141
}
126-
this.touchmoveTimeout = setTimeout(() => {
127-
let pageY = e.touches[0].pageY
128-
let index = Math.floor(pageY / this.itemHeight)
129-
let item = this.lists[index]
130-
if (item) {
131-
this.scrollViewId = 'uni-indexed-list-' + item.key
132-
this.touchmoveIndex = index
133-
}
134-
}, 10)
135142
},
136143
touchEnd() {
137144
this.touchmove = false

‎components/uni-list-item/uni-list-item.vue‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@
164164
165165
.uni-list-item__content-title {
166166
font-size: 32rpx;
167-
line-height: 1.5;
168167
color: #3b4144;
169168
overflow: hidden;
170169
}
@@ -174,7 +173,6 @@
174173
color: #999;
175174
font-size: 28rpx;
176175
overflow: hidden;
177-
line-height: 1;
178176
}
179177
180178
.uni-list-item__extra {

‎components/uni-load-more/uni-load-more.vue‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<view class="uni-load-more">
2+
<view class="uni-load-more" @click="onClick">
33
<view v-if="(iconType==='circle' || iconType==='auto' && platform === 'android') && status === 'loading' && showIcon" class="uni-load-more__img">
44
<image ref="loadingAndroid" class="uni-load-more__img--android" src="data:image/png;base64,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" mode="widthFix"></image>
55
</view>
@@ -94,12 +94,12 @@
9494
if (!this.$refs['loadingAndroid']) {
9595
return false
9696
}
97-
this.rotate += 30
97+
this.rotate += 360
9898
animation.transition(this.$refs['loadingAndroid'], {
9999
styles: {
100100
transform: `rotate(${this.rotate}deg)`
101101
},
102-
duration: 84,
102+
duration: 840,
103103
timingFunction: 'linear',
104104
delay: 0
105105
}, () => {
@@ -126,10 +126,17 @@
126126
if (!this.stopAnimation) {
127127
this.loopAnimationIos()
128128
}
129-
}, 84)
129+
}, 70)
130130
});
131-
}
131+
},
132132
// #endif
133+
onClick() {
134+
this.$emit('clickLoadMore', {
135+
detail: {
136+
status: this.status,
137+
}
138+
})
139+
}
133140
}
134141
}
135142
</script>

‎components/uni-nav-bar/uni-nav-bar.vue‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
}
123123
124124
.uni-navbar__content_view {
125-
/* #ifndef APP-PLUS-NVUE */
125+
/* #ifndef APP-NVUE */
126126
display: flex;
127127
/* #endif */
128128
align-items: center;
@@ -132,7 +132,7 @@
132132
}
133133
134134
.uni-navbar__header {
135-
/* #ifndef APP-PLUS-NVUE */
135+
/* #ifndef APP-NVUE */
136136
display: flex;
137137
/* #endif */
138138
flex-direction: row;
@@ -145,7 +145,7 @@
145145
}
146146
147147
.uni-navbar__header-btns {
148-
/* #ifndef APP-PLUS-NVUE */
148+
/* #ifndef APP-NVUE */
149149
display: flex;
150150
/* #endif */
151151
flex-wrap: nowrap;
@@ -156,15 +156,15 @@
156156
}
157157
158158
.uni-navbar__header-btns-left {
159-
/* #ifndef APP-PLUS-NVUE */
159+
/* #ifndef APP-NVUE */
160160
display: flex;
161161
/* #endif */
162162
width: 150rpx;
163163
justify-content: flex-start;
164164
}
165165
166166
.uni-navbar__header-btns-right {
167-
/* #ifndef APP-PLUS-NVUE */
167+
/* #ifndef APP-NVUE */
168168
display: flex;
169169
/* #endif */
170170
width: 150rpx;
@@ -177,7 +177,7 @@
177177
}
178178
179179
.uni-navbar__header-container-inner {
180-
/* #ifndef APP-PLUS-NVUE */
180+
/* #ifndef APP-NVUE */
181181
display: flex;
182182
/* #endif */
183183
flex: 1;
@@ -198,7 +198,7 @@
198198
}
199199
200200
.uni-navbar--shadow {
201-
/* #ifndef APP-PLUS-NVUE */
201+
/* #ifndef APP-NVUE */
202202
box-shadow: 0 1px 6px #ccc;
203203
/* #endif */
204204
}

0 commit comments

Comments
 (0)