Skip to content

Commit 949abe5

Browse files
wlxuquwlxuqu
committed
Merge branch 'yiruiwen' into dev
2 parents 9ebe74b + cae3f55 commit 949abe5

File tree

21 files changed

+361
-531
lines changed

21 files changed

+361
-531
lines changed

‎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.4",
5+
"versionName" : "1.4.5",
66
"versionCode" : "100",
77
"transformPx" : false,
88
"app-plus" : {

‎pages.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
// "current": 0, //当前激活的模式(list 的索引项)
77
// "list": [{
88
// "name": "test", //模式名称
9-
// "path": "pages/componentsC/test/index", //启动页面，必选
9+
// "path": "pages/componentsB/checkbox/index", //启动页面，必选
1010
// "query": "id=1&name=2" //启动参数，在页面的onLoad函数里面得到
11-
// }]
11+
// }]
1212
// },
1313
"pages": [
14-
// 演示-组件
14+
// 演示-组件
1515
{
1616
"path": "pages/example/components",
1717
"style": {
18-
"navigationBarTitleText": "组件"
18+
"navigationBarTitleText": "组件"
1919
}
2020
},
2121
// avatarCropper-头像裁剪
@@ -143,7 +143,7 @@
143143
"navigationBarTitleText": "badge-徽标数"
144144
}
145145
},
146-
// button按钮
146+
// button按钮
147147
{
148148
"path": "button/index",
149149
"style": {
@@ -583,7 +583,7 @@
583583
"style": {
584584
"navigationBarTitleText": "icon-字体图标"
585585
}
586-
}, // avatar-用户头像展示
586+
}, // avatar-用户头像展示
587587
{
588588
"path": "avatar/index",
589589
"style": {

‎pages/componentsA/form/index.vue

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<u-verification-code seconds="60" ref="uCode" @change="codeChange"></u-verification-code>
6161
<view class="u-config-wrap">
6262
<view class="u-config-title u-border-bottom">
63-
参数配置
63+
参数配置
6464
</view>
6565
<view class="u-config-item">
6666
<view class="u-item-title">label对齐方式</view>
@@ -119,15 +119,15 @@ export default {
119119
],
120120
rules: {
121121
name: [
122-
{
123-
required: true,
124-
message: '请输入姓名',
122+
{
123+
required: true,
124+
message: '请输入姓名',
125125
trigger: 'blur' ,
126-
},
127-
{
128-
min: 3,
129-
max: 5,
130-
message: '姓名长度在3到5个字符',
126+
},
127+
{
128+
min: 3,
129+
max: 5,
130+
message: '姓名长度在3到5个字符',
131131
trigger: ['change','blur'],
132132
},
133133
{
@@ -160,19 +160,19 @@ export default {
160160
],
161161
sex: [
162162
{
163-
required: true,
163+
required: true,
164164
message: '请选择性别',
165165
trigger: 'change'
166-
},
166+
},
167167
],
168168
intro: [
169169
{
170-
required: true,
170+
required: true,
171171
message: '请填写简介'
172-
},
172+
},
173173
{
174-
min: 5,
175-
message: '简介不能少于5个字',
174+
min: 5,
175+
message: '简介不能少于5个字',
176176
trigger: 'change' ,
177177
},
178178
// 正则校验示例，此处用正则校验是否中文，此处仅为示例，因为uView有this.$u.test.chinese可以判断是否中文
@@ -184,36 +184,36 @@ export default {
184184
],
185185
likeFruit: [
186186
{
187-
required: true,
187+
required: true,
188188
message: '请选择您喜欢的水果',
189189
trigger: 'change',
190190
type: 'array',
191191
}
192192
],
193193
payType: [
194194
{
195-
required: true,
195+
required: true,
196196
message: '请选择任意一种支付方式',
197197
trigger: 'change',
198198
}
199199
],
200200
region: [
201201
{
202-
required: true,
202+
required: true,
203203
message: '请选择地区',
204204
trigger: 'change',
205205
}
206206
],
207207
goodsType: [
208208
{
209-
required: true,
209+
required: true,
210210
message: '请选择商品类型',
211211
trigger: 'change',
212212
}
213213
],
214214
phone: [
215215
{
216-
required: true,
216+
required: true,
217217
message: '请输入手机号',
218218
trigger: ['change','blur'],
219219
},
@@ -229,7 +229,7 @@ export default {
229229
],
230230
code: [
231231
{
232-
required: true,
232+
required: true,
233233
message: '请输入验证码',
234234
trigger: ['change','blur'],
235235
},
@@ -241,7 +241,7 @@ export default {
241241
],
242242
password: [
243243
{
244-
required: true,
244+
required: true,
245245
message: '请输入密码',
246246
trigger: ['change','blur'],
247247
},
@@ -254,7 +254,7 @@ export default {
254254
],
255255
rePassword: [
256256
{
257-
required: true,
257+
required: true,
258258
message: '请重新输入密码',
259259
trigger: ['change','blur'],
260260
},
@@ -337,7 +337,7 @@ export default {
337337
};
338338
},
339339
onLoad() {
340-
340+
341341
},
342342
computed: {
343343
borderCurrent() {
@@ -445,7 +445,7 @@ export default {
445445
display: flex;
446446
align-items: center;
447447
margin: 40rpx 0;
448-
448+
449449
.agreement-text {
450450
padding-left: 8rpx;
451451
color: $u-tips-color;

‎pages/componentsB/checkbox/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
activeColor: '#2979ff',
9292
size: 34,
9393
wrap: false,
94-
width: ''
94+
width: 'auto'
9595
}
9696
},
9797
computed: {

‎pages/componentsB/image/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<view class="u-demo-wrap">
44
<view class="u-demo-title">演示效果</view>
55
<view class="u-demo-area u-flex u-row-center">
6-
<u-image :shape="shape" ref="uImage" :width="width" :height="height" :src="src" mode="aspectFill">
6+
<u-image border-radius="100%" :shape="shape" ref="uImage" :width="width" :height="height" :src="src" mode="aspectFill">
77
<u-loading size="44" mode="flower" slot="loading" v-if="loadingSlot"></u-loading>
88
<view v-if="errorSlot" slot="error" style="font-size: 24rpx;">加载失败</view>
99
</u-image>

‎pages/componentsB/radio/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
activeColor: '#2979ff',
8686
size: 34,
8787
wrap: false,
88-
width: ''
88+
width: 'auto'
8989
}
9090
},
9191
methods: {

‎pages/componentsB/rate/index.vue

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<view class="u-demo-wrap">
44
<view class="u-demo-title">演示效果</view>
55
<view class="u-demo-area">
6-
<u-rate :count="count" :current="current" @change="change"
7-
:active-color="activeColor" :inaction-color="inactiveColor"
8-
:active-icon="activeIcon" :inactive-icon="inactiveIcon"
6+
<u-rate v-model="value" :count="count" @change="change"
7+
:active-color="activeColor" :inaction-color="inactiveColor"
8+
:active-icon="activeIcon" :inactive-icon="inactiveIcon"
99
:disabled="disabled"></u-rate>
1010
</view>
1111
</view>
@@ -45,13 +45,20 @@
4545
export default {
4646
data() {
4747
return {
48-
current: 1,
48+
// 1.4.5后推荐使用v-model双向绑定，弃用current
49+
// current: 1,
4950
activeColor: '#FA3534',
5051
inactiveColor: '#b2b2b2',
5152
disabled: false,
5253
count: 5,
5354
customIcon: false,
5455
plain: false,
56+
value: 0
57+
}
58+
},
59+
watch: {
60+
value(n) {
61+
// console.log(n);
5562
}
5663
},
5764
computed: {

0 commit comments

Comments
 (0)