Skip to content

Commit 6dffef0

Browse files
wlxuquwlxuqu
committed
Merge branch 'nvue' into yiruiwen
2 parents 767226b + ffbdf8d commit 6dffef0

File tree

69 files changed

+225
-176
lines changed

Some content is hidden

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

69 files changed

+225
-176
lines changed

‎components/page-nav/page-nav.vue

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,21 @@
44
<image class="logo" src="https://cdn.uviewui.com/uview/common/logo.png" mode="widthFix"></image>
55
<view class="nav-info">
66
<view class="nav-title__text">
7-
{{$t('common.title')}}
7+
<!-- {{$t('common.title')}} -->
8+
{{title}}
89
</view>
910
<view class="nav-slogan">
10-
{{$t('common.intro')}}
11+
<!-- {{$t('common.intro')}} -->
12+
{{desc}}
1113
</view>
1214
</view>
1315
</view>
1416
<view class="nav-desc">
1517
{{desc}}
1618
</view>
17-
<view class="lang" @tap="switchLang">
19+
<!-- <view class="lang" @tap="switchLang">
1820
<u-icon size="46" color="warning" :name="lang"></u-icon>
19-
</view>
21+
</view> -->
2022
</view>
2123
</template>
2224

@@ -27,20 +29,20 @@
2729
title: String,
2830
},
2931
computed: {
30-
lang() {
31-
return this.$i18n.locale == 'zh' ? 'zh' : 'en';
32-
}
32+
// lang() {
33+
// return this.$i18n.locale == 'zh' ? 'zh' : 'en';
34+
// }
3335
},
3436
methods: {
35-
switchLang() {
36-
this.$i18n.locale = this.$i18n.locale == 'en' ? 'zh' : 'en';
37-
this.vuex_tabbar[0].text = this.$t('nav.components')
38-
this.vuex_tabbar[1].text = this.$t('nav.js')
39-
this.vuex_tabbar[2].text = this.$t('nav.template')
40-
uni.setNavigationBarTitle({
41-
title: this.$t(this.title)
42-
});
43-
}
37+
// switchLang() {
38+
// this.$i18n.locale = this.$i18n.locale == 'en' ? 'zh' : 'en';
39+
// this.vuex_tabbar[0].text = this.$t('nav.components')
40+
// this.vuex_tabbar[1].text = this.$t('nav.js')
41+
// this.vuex_tabbar[2].text = this.$t('nav.template')
42+
// uni.setNavigationBarTitle({
43+
// title: this.$t(this.title)
44+
// });
45+
// }
4446
}
4547
}
4648
</script>
@@ -58,7 +60,10 @@
5860
}
5961
6062
.nav-title {
63+
/* #ifndef APP-NVUE */
6164
display: flex;
65+
/* #endif */
66+
flex-direction: row;
6267
align-items: center;
6368
}
6469
@@ -67,16 +72,19 @@
6772
}
6873
6974
.nav-title__text {
75+
/* #ifndef APP-NVUE */
7076
display: flex;
77+
/* #endif */
7178
color: $u-main-color;
7279
font-size: 50rpx;
7380
font-weight: bold;
7481
}
7582
7683
.logo {
7784
width: 140rpx;
78-
flex: 0 0 140rpx;
85+
/* #ifndef APP-NVUE */
7986
height: auto;
87+
/* #endif */
8088
}
8189
8290
.nav-slogan {

‎pages/example/components.vue renamed to ‎pages/example/components.nvue

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
data() {
2121
return {
2222
list: list,
23-
//desc: '众多组件覆盖开发过程的各个需求，组件功能丰富，多端兼容。让你快速集成，开箱即用。',
23+
desc: '众多组件覆盖开发过程的各个需求，组件功能丰富，多端兼容。让你快速集成，开箱即用。',
2424
}
2525
},
2626
computed: {
@@ -29,29 +29,31 @@
2929
return 'https://cdn.uviewui.com/uview/example/' + path + '.png';
3030
}
3131
},
32-
desc() {
33-
return this.$t('components.desc');
34-
}
32+
// desc() {
33+
// return this.$t('components.desc');
34+
// }
3535
},
3636
onShow() {
37-
uni.setNavigationBarTitle({
38-
title: this.$t('nav.components')
39-
});
37+
// uni.setNavigationBarTitle({
38+
// title: this.$t('nav.components')
39+
// });
4040
},
4141
created() {
42-
42+
//console.log(this.abc);
4343
},
4444
methods: {
4545
openPage(path) {
46-
this.$u.route({
46+
this.$u.route({
4747
url: path
4848
})
4949
},
5050
getGroupTitle(item) {
51-
return this.$i18n.locale == 'zh' ? item.groupName : item.groupName_en
51+
// return this.$i18n.locale == 'zh' ? item.groupName : item.groupName_en
52+
return item.groupName;
5253
},
5354
getFieldTitle(item) {
54-
return this.$i18n.locale == 'zh' ? item.title : item.title_en
55+
// return this.$i18n.locale == 'zh' ? item.title : item.title_en
56+
return item.title;
5557
}
5658
}
5759
}
@@ -64,6 +66,7 @@
6466
</style>
6567

6668
<style lang="scss" scoped>
69+
6770
.u-cell-icon {
6871
width: 36rpx;
6972
height: 36rpx;

‎uview-ui/components/u-action-sheet/u-action-sheet.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
}
164164
165165
.u-action-sheet-item {
166-
display: flex;
166+
@include vue-flex;;
167167
line-height: 1;
168168
justify-content: center;
169169
align-items: center;

‎uview-ui/components/u-alert-tips/u-alert-tips.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
@import "../../libs/css/style.components.scss";
167167
168168
.u-alert-tips {
169-
display: flex;
169+
@include vue-flex;
170170
align-items: center;
171171
padding: 16rpx 30rpx;
172172
border-radius: 8rpx;

‎uview-ui/components/u-avatar-cropper/u-avatar-cropper.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ export default {
252252
253253
.cropper-wrapper {
254254
position: relative;
255-
display: flex;
255+
@include vue-flex;
256256
flex-direction: row;
257257
justify-content: space-between;
258258
align-items: center;
@@ -262,7 +262,7 @@ export default {
262262
263263
.cropper-buttons {
264264
width: 100vw;
265-
display: flex;
265+
@include vue-flex;
266266
flex-direction: row;
267267
justify-content: space-between;
268268
align-items: center;

‎uview-ui/components/u-avatar/u-avatar.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
width: 32rpx;
201201
color: #ffffff;
202202
height: 32rpx;
203-
display: flex;
203+
@include vue-flex;
204204
justify-content: center;
205205
align-items: center;
206206
border-radius: 100rpx;
@@ -227,7 +227,7 @@
227227
width: 32rpx;
228228
color: #ffffff;
229229
height: 32rpx;
230-
display: flex;
230+
@include vue-flex;
231231
justify-content: center;
232232
align-items: center;
233233
border-radius: 100rpx;

‎uview-ui/components/u-back-top/u-back-top.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
height: 80rpx;
131131
position: fixed;
132132
z-index: 9;
133-
display: flex;
133+
@include vue-flex;
134134
flex-direction: column;
135135
justify-content: center;
136136
background-color: #E1E1E1;
@@ -139,7 +139,7 @@
139139
transition: opacity 0.4s;
140140
141141
&__content {
142-
display: flex;
142+
@include vue-flex;
143143
flex-direction: column;
144144
align-items: center;
145145

‎uview-ui/components/u-badge/u-badge.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,9 @@
141141
@import "../../libs/css/style.components.scss";
142142
143143
.u-badge {
144+
/* #ifndef APP-NVUE */
144145
display: inline-flex;
146+
/* #endif */
145147
justify-content: center;
146148
align-items: center;
147149
line-height: 24rpx;
@@ -207,7 +209,7 @@
207209
// }
208210
209211
.u-info {
210-
background: $u-type-info;
212+
background-color: $u-type-info;
211213
color: #fff;
212214
}
213215
</style>

‎uview-ui/components/u-button/u-button.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ export default {
343343
// 避免边框某些场景可能被“裁剪”，不能设置为hidden
344344
overflow: visible;
345345
line-height: 1;
346-
display: flex;
346+
@include vue-flex;
347347
align-items: center;
348348
justify-content: center;
349349
cursor: pointer;

‎uview-ui/components/u-calendar/u-calendar.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@
502502
&__text {
503503
margin-top: 30rpx;
504504
padding: 0 60rpx;
505-
display: flex;
505+
@include vue-flex;
506506
justify-content: center;
507507
align-items: center;
508508
}
@@ -525,7 +525,7 @@
525525
}
526526
527527
&__week-day {
528-
display: flex;
528+
@include vue-flex;
529529
align-items: center;
530530
justify-content: center;
531531
padding: 6px 0;
@@ -539,7 +539,7 @@
539539
540540
&__content {
541541
width: 100%;
542-
display: flex;
542+
@include vue-flex;
543543
flex-wrap: wrap;
544544
padding: 6px 0;
545545
box-sizing: border-box;
@@ -558,7 +558,7 @@
558558
559559
&__item {
560560
width: 14.2857%;
561-
display: flex;
561+
@include vue-flex;
562562
align-items: center;
563563
justify-content: center;
564564
padding: 6px 0;
@@ -570,7 +570,7 @@
570570
height: 84rpx;
571571
display: -webkit-box;
572572
display: -webkit-flex;
573-
display: flex;
573+
@include vue-flex;
574574
align-items: center;
575575
justify-content: center;
576576
flex-direction: column;
@@ -619,7 +619,7 @@
619619
620620
&__bottom {
621621
width: 100%;
622-
display: flex;
622+
@include vue-flex;
623623
align-items: center;
624624
justify-content: center;
625625
flex-direction: column;

‎uview-ui/components/u-car-keyboard/u-car-keyboard.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<view class="u-keyboard" @touchmove.stop.prevent>
2+
<view class="u-keyboard" @touchmove.stop.prevent="() => {}">
33
<view class="u-keyboard-grids">
44
<block>
55
<view class="u-keyboard-grids-item" v-for="(group, i) in abc ? EngKeyBoardList : areaList" :key="i">
@@ -176,7 +176,7 @@
176176
}
177177
178178
.u-keyboard-grids-item {
179-
display: flex;
179+
@include vue-flex;
180180
align-items: center;
181181
justify-content: center;
182182
}
@@ -208,7 +208,7 @@
208208
bottom: 32rpx;
209209
height: 80rpx;
210210
background-color: rgb(185, 188, 195);
211-
display: flex;
211+
@include vue-flex;
212212
align-items: center;
213213
border-radius: 8rpx;
214214
justify-content: center;
@@ -225,7 +225,7 @@
225225
bottom: 32rpx;
226226
height: 80rpx;
227227
background-color: #ffffff;
228-
display: flex;
228+
@include vue-flex;
229229
align-items: center;
230230
border-radius: 8rpx;
231231
justify-content: center;

‎uview-ui/components/u-cell-group/u-cell-group.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,6 @@
6565
6666
.u-cell-item-box {
6767
background-color: #FFFFFF;
68+
flex-direction: row;
6869
}
6970
</style>

0 commit comments

Comments
 (0)