Skip to content

Commit 471a510

Browse files
committed
fix to vue3
1 parent c80cb3e commit 471a510

File tree

10 files changed

+32
-25
lines changed

10 files changed

+32
-25
lines changed

components/uni-calendar/uni-calendar.vue

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,13 @@
343343
}
344344
345345
.uni-calendar--fixed {
346-
position: fixed;
347-
bottom: calc(var(--window-bottom));
346+
position: fixed;
347+
/* #ifndef APP-NVUE */
348+
bottom: calc(var(--window-bottom));
349+
/* #endif */
350+
/* #ifdef APP-NVUE */
351+
bottom: 0;
352+
/* #endif */
348353
left: 0;
349354
right: 0;
350355
transition-property: transform;

components/uni-tag/uni-tag.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,10 @@
111111
<style scoped>
112112
.uni-tag {
113113
/* #ifndef APP-NVUE */
114-
display: inline-block;
114+
/* display: inline-block; */
115115
/* #endif */
116116
/* #ifdef APP-NVUE */
117-
align-self: flex-start;
117+
/* align-self: flex-start; */
118118
/* #endif */
119119
padding: 0px 16px;
120120
line-height: 30px;
@@ -280,4 +280,4 @@
280280
border-style: solid;
281281
border-color: #f8f8f8;
282282
}
283-
</style>
283+
</style>

manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,5 +137,5 @@
137137
"timeout" : 20000
138138
}
139139
},
140-
"vueVersion" : "2"
140+
"vueVersion" : "3"
141141
}
File renamed without changes.

pages/extUI/forms/forms.nvue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
<uni-forms-item label="自我介绍">
2121
<uni-easyinput type="textarea" v-model="baseFormData.introduction" placeholder="请输入自我介绍" />
2222
</uni-forms-item>
23-
<uni-forms-item label="日期时间">
23+
<!-- <uni-forms-item label="日期时间">
2424
<uni-datetime-picker type="datetime" return-type="timestamp" v-model="baseFormData.datetimesingle" />
25-
</uni-forms-item>
25+
</uni-forms-item> -->
2626
</uni-forms>
2727
</view>
2828
<uni-section title="对齐方式" type="line"></uni-section>
File renamed without changes.

pages/tabBar/extUI/extUI.nvue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,13 @@
200200
name: "uni-table 表格",
201201
url: "table"
202202
},
203-
// #endif
203+
// #endif
204+
// #ifndef APP-NVUE
204205
{
205206
name: "uni-tag 标签",
206207
url: "tag"
207-
},
208+
},
209+
// #endif
208210
{
209211
name: "uni-title 章节标题",
210212
url: "title"

pages/tabBar/template/template.nvue

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,14 @@
103103
name: '列表到详情示例',
104104
url: 'list2detail-list'
105105
},
106+
// #endif
107+
// #ifndef VUE3
108+
// #ifdef APP-PLUS
109+
// {
110+
// name: '上下滑动切换视频',
111+
// url: 'swiper-vertical'
112+
// },
106113
// #endif
107-
// #ifdef APP-PLUS || H5 || MP-WEIXIN || MP-QQ
108-
{
109-
name: '上下滑动切换视频',
110-
url: 'swiper-vertical'
111-
},
112114
// #endif
113115
// #ifdef APP-NVUE
114116
{
@@ -129,14 +131,12 @@
129131
name: '打开外部应用',
130132
url: 'scheme'
131133
},
132-
// #endif
134+
// #endif
133135
// #ifdef APP-PLUS || MP-WEIXIN || MP-QQ || H5
134-
// #ifndef VUE3
135-
{
136-
name: '微信自定义组件示例(vant ui)',
137-
url: 'vant-button'
138-
}
139-
// #endif
136+
// {
137+
// name: '微信自定义组件示例(vant ui)',
138+
// url: 'vant-button'
139+
// }
140140
// #endif
141141
]
142142
}

pages/template/swiper-vertical/swiper-vertical.nvue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,12 @@
144144
</script>
145145

146146
<style>
147-
/* #ifndef APP-PLUS */
148-
page {
147+
/* #ifndef H5 */
148+
/* page {
149149
width: 100%;
150150
min-height: 100%;
151151
display: flex;
152-
}
152+
} */
153153
/* #endif */
154154

155155
.page {

0 commit comments

Comments
 (0)