Skip to content

Commit 9ebe74b

Browse files
wlxuquwlxuqu
committed
Merge branch 'yiruiwen' into dev
2 parents 09be3a9 + 6f96309 commit 9ebe74b

File tree

35 files changed

+774
-289
lines changed

35 files changed

+774
-289
lines changed

‎.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[*]
22
#缩进风格：空格
3-
indent_style = space
3+
indent_style = tab
44
#缩进大小2
55
indent_size = 4
66
#换行符lf

‎README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
uView UI，是[uni-app](https://uniapp.dcloud.io/)生态优秀的UI框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水
1111

12+
### **欢迎加群交流反馈：249718512**
13+
1214
## 特性
1315

1416
- 兼容安卓，iOS，微信小程序，H5，QQ小程序，百度小程序，支付宝小程序，头条小程序
@@ -91,7 +93,7 @@ Vue.use(uView);
9193
}
9294
```
9395

94-
请通过[快速上手](https://uviewui.com/components/quickstart.html)了解更详细的内容
96+
请通过[快速上手](https://uviewui.com/components/quickstart.html)了解更详细的内容
9597

9698
## 使用方法
9799
配置easycom规则后，自动按需引入，无需`import`组件，直接引用即可。
@@ -102,7 +104,7 @@ Vue.use(uView);
102104
</template>
103105
```
104106

105-
请通过[快速上手](https://uviewui.com/components/quickstart.html)了解更详细的内容
107+
请通过[快速上手](https://uviewui.com/components/quickstart.html)了解更详细的内容
106108

107109

108110
## 捐赠uView的研发

‎manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name" : "uView",
33
"appid" : "__UNI__60F4B81",
44
"description" : "多平台快速开发的UI框架",
5-
"versionName" : "1.4.0",
5+
"versionName" : "1.4.4",
66
"versionCode" : "100",
77
"transformPx" : false,
88
"app-plus" : {

‎pages.json

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
"easycom": {
33
"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
44
},
5-
"condition": { //模式配置，仅开发期间生效
6-
"current": 0, //当前激活的模式(list 的索引项)
7-
"list": [{
8-
"name": "test", //模式名称
9-
"path": "pages/componentsC/test/index", //启动页面，必选
10-
"query": "id=1&name=2" //启动参数，在页面的onLoad函数里面得到
11-
}]
12-
},
5+
// "condition": { //模式配置，仅开发期间生效
6+
// "current": 0, //当前激活的模式(list 的索引项)
7+
// "list": [{
8+
// "name": "test", //模式名称
9+
// "path": "pages/componentsC/test/index", //启动页面，必选
10+
// "query": "id=1&name=2" //启动参数，在页面的onLoad函数里面得到
11+
// }]
12+
// },
1313
"pages": [
1414
// 演示-组件
1515
{
@@ -649,6 +649,13 @@
649649
{
650650
"root": "pages/componentsB",
651651
"pages": [
652+
// tabbar-底部导航栏
653+
{
654+
"path": "tabbar/index",
655+
"style": {
656+
"navigationBarTitleText": "tabbar-底部导航栏"
657+
}
658+
},
652659
// line-线条
653660
{
654661
"path": "line/index",

‎pages/componentsB/tabbar/index.vue

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<template>
2+
</template>
3+
4+
<script>
5+
</script>
6+
7+
<style>
8+
</style>

‎pages/componentsC/layout/index.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
<view class="u-demo-title">演示效果</view>
55
<view class="u-demo-area">
66
<u-row gutter="20" :justify="justify">
7-
<u-col :span="span" :offset="offset">
7+
<u-col :span="span" :offset="offset" @click="click">
88
<view class="demo-layout bg-purple-dark">
9-
9+
1010
</view>
1111
</u-col>
1212
<u-col :span="span" :offset="offset">
1313
<view class="demo-layout bg-purple-dark">
14-
14+
1515
</view>
1616
</u-col>
1717
<u-col :span="span" :offset="offset">
1818
<view class="demo-layout bg-purple-dark">
19-
19+
2020
</view>
2121
</u-col>
2222
</u-row>
@@ -125,7 +125,7 @@
125125
.bg-purple-dark {
126126
background: #99a9bf;
127127
}
128-
128+
129129
// H5中，电脑端文档演示时，可能会导致演示块挤出边界，特别处理。
130130
// 真实使用环境不会产生此问题
131131
/* #ifdef H5 */

0 commit comments

Comments
 (0)