Skip to content

Commit 09be3a9

Browse files
wlxuquwlxuqu
committed
Merge branch 'yiruiwen' into dev
2 parents 51658bc + fad8df8 commit 09be3a9

File tree

33 files changed

+626
-389
lines changed

33 files changed

+626
-389
lines changed

‎.editorconfig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[*]
2+
#缩进风格：空格
3+
indent_style = space
4+
#缩进大小2
5+
indent_size = 4
6+
#换行符lf
7+
end_of_line = lf
8+
#字符集utf-8
9+
charset = utf-8
10+
#是否删除行尾的空格
11+
trim_trailing_whitespace = true
12+
13+

‎common/demo.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/* #ifndef APP-NVUE */
2+
view,
3+
text {
4+
box-sizing: border-box;
5+
}
6+
/* #endif */
17

28
/* start--演示页面使用的统一样式--start */
39
.u-demo {

‎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.3.8",
5+
"versionName" : "1.4.0",
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
{
@@ -656,6 +656,13 @@
656656
"navigationBarTitleText": "line-线条"
657657
}
658658
},
659+
// image-图片
660+
{
661+
"path": "image/index",
662+
"style": {
663+
"navigationBarTitleText": "image-图片"
664+
}
665+
},
659666
// card-卡片
660667
{
661668
"path": "card/index",

‎pages/componentsA/field/index.vue

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,25 @@
33
<view class="u-demo-wrap" style="background-color: #FFFFFF;">
44
<view class="u-demo-title">演示效果</view>
55
<view class="u-demo-area">
6-
<u-cell-group>
7-
<u-field
8-
v-model="mobile"
9-
label="手机号"
10-
:error-message="errorMessage"
11-
placeholder="请填写手机号"
12-
:required="required"
13-
:icon="icon1"
14-
:type="type"
15-
>
16-
</u-field>
17-
<u-field
18-
v-model="code"
19-
label="验证码"
20-
placeholder="请填写验证码"
21-
:required="required"
22-
:icon="icon2"
23-
>
24-
<u-button v-if="showBtn" slot="right" size="mini" type="success">发送验证码</u-button>
25-
</u-field>
26-
</u-cell-group>
6+
<u-field
7+
v-model="mobile"
8+
label="手机号"
9+
:error-message="errorMessage"
10+
placeholder="请填写手机号"
11+
:required="required"
12+
:icon="icon1"
13+
:type="type"
14+
>
15+
</u-field>
16+
<u-field
17+
v-model="code"
18+
label="验证码"
19+
placeholder="请填写验证码"
20+
:required="required"
21+
:icon="icon2"
22+
>
23+
<u-button v-if="showBtn" slot="right" size="mini" type="success">发送验证码</u-button>
24+
</u-field>
2725
</view>
2826
</view>
2927
<view class="u-config-wrap">

‎pages/componentsA/icon/index.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,6 @@
628628
flex: 0 0 33.33333333%;
629629
justify-content: center;
630630
overflow: hidden;
631-
padding: 0 6rpx;
632631
}
633632
634633
.u-icon-name {

‎pages/componentsA/tag/index.vue

Lines changed: 47 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@
44
<view class="u-demo-title">演示效果</view>
55
<view class="u-demo-area">
66
<u-toast ref="uToast"></u-toast>
7-
<u-tag :text="text" :type="type" :shape="shape" :closeable="closeable" :mode="mode"
8-
@close="close" @click="click" :show="show" :size="size"/>
7+
<u-tag :text="text" :type="type" :shape="shape" :closeable="closeable" :mode="mode" @close="close" @click="click" :show="show" :size="size" />
98
</view>
109
</view>
1110
<view class="u-config-wrap">
12-
<view class="u-config-title u-border-bottom">
13-
参数配置
14-
</view>
11+
<view class="u-config-title u-border-bottom">参数配置</view>
1512
<view class="u-config-item">
1613
<view class="u-item-title">模式选择</view>
1714
<u-subsection vibrateShort :list="['light', 'dark', 'plain']" @change="modeChange"></u-subsection>
@@ -41,53 +38,54 @@
4138
</template>
4239

4340
<script>
44-
export default {
45-
data() {
46-
return {
47-
text: '蒹葭苍苍',
48-
mode: 'light',
49-
type: 'error',
50-
size: 'default',
51-
shape: 'square',
52-
closeable: true,
53-
show: true
54-
}
41+
export default {
42+
data() {
43+
return {
44+
text: '蒹葭苍苍',
45+
mode: 'light',
46+
type: 'error',
47+
size: 'default',
48+
shape: 'square',
49+
closeable: true,
50+
show: true
51+
};
52+
},
53+
methods: {
54+
modeChange(index) {
55+
this.mode = index == 0 ? 'light' : index == 1 ? 'dark' : 'plain';
56+
},
57+
textChange(index) {
58+
this.text = index == 0 ? '蒹葭苍苍' : index == 1 ? '白露为霜' : '在水一方';
59+
},
60+
typeChange(index) {
61+
this.type = index == 0 ? 'primary' : index == 1 ? 'success' : index == 2 ? 'error' : index == 3 ? 'warning' : 'info';
62+
},
63+
shapeChange(index) {
64+
this.shape = index == 0 ? 'square' : index == 1 ? 'circle' : index == 2 ? 'circleLeft' : 'circleRight';
65+
},
66+
sizeChange(index) {
67+
this.size = index == 0 ? 'default' : 'mini';
68+
},
69+
closeableChange(index) {
70+
this.closeable = index == 0 ? true : false;
71+
},
72+
click(index) {
73+
this.$refs.uToast.show({
74+
title: `第${index + 1}个标签被点击`,
75+
type: 'success'
76+
});
5577
},
56-
methods: {
57-
modeChange(index) {
58-
this.mode = index == 0 ? 'light' : index == 1 ? 'dark' : 'plain';
59-
},
60-
textChange(index) {
61-
this.text = index == 0 ? '蒹葭苍苍' : index == 1 ? '白露为霜' : '在水一方';
62-
},
63-
typeChange(index) {
64-
this.type = index == 0 ? 'primary' : index == 1 ? 'success' : index == 2 ? 'error' : index == 3 ? 'warning' : 'info';
65-
},
66-
shapeChange(index) {
67-
this.shape = index == 0 ? 'square' : index == 1 ? 'circle' : index == 2 ? 'circleLeft' : 'circleRight';
68-
},
69-
sizeChange(index) {
70-
this.size = index == 0 ? 'default' : 'mini';
71-
},
72-
closeableChange(index) {
73-
this.closeable = index == 0 ? true : false;
74-
},
75-
click(index) {
76-
this.$refs.uToast.show({
77-
title: `第${index + 1}个标签被点击`,
78-
type: 'success'
79-
})
80-
},
81-
close(index) {
82-
this.$refs.uToast.show({
83-
title: `关闭图标被点击`,
84-
type: 'success'
85-
})
86-
},
78+
close(index) {
79+
this.$refs.uToast.show({
80+
title: `关闭图标被点击`,
81+
type: 'success'
82+
});
8783
}
8884
}
85+
};
8986
</script>
9087

9188
<style lang="scss" scoped>
92-
.u-demo {}
93-
</style>
89+
.u-demo {
90+
}
91+
</style>

0 commit comments

Comments
 (0)