Skip to content

Commit 667de30

Browse files
wlxuquwlxuqu
committed
Merge branch 'yiruiwen' into dev
2 parents 14f8378 + b3682c0 commit 667de30

File tree

20 files changed

+305
-69
lines changed

20 files changed

+305
-69
lines changed

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717

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

20-
## [点击加群交流反馈：1129077272](https://qm.qq.com/cgi-bin/qm/qr?k=1FfucLpozYbnb7FWo_KsqAdEi1mE3Qrf&jump_from=webapi)
20+
## [官方文档：https://www.uviewui.com](https://www.uviewui.com)
21+
22+
### [点击加群交流反馈：1129077272](https://qm.qq.com/cgi-bin/qm/qr?k=1FfucLpozYbnb7FWo_KsqAdEi1mE3Qrf&jump_from=webapi)
2123

2224
## 特性
2325

@@ -39,8 +41,6 @@ uView UI，是[uni-app](https://uniapp.dcloud.io/)生态优秀的UI框架，全
3941

4042
## 友情链接
4143

42-
<br>
43-
4444
#### **vue-admin-beautiful** —— [企业级、通用型中后台前端解决方案（基于vue/cli 4 最新版，同时支持电脑，手机，平板）](https://github.com/chuzhixin/vue-admin-beautiful)
4545

4646
#### **vue-admin-beautiful** —— [在线演示](http://beautiful.panm.cn/vue-admin-beautiful/#/index)

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

‎pages.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// "current": 0, //当前激活的模式(list 的索引项)
77
// "list": [{
88
// "name": "test", //模式名称
9-
// "path": "pages/componentsB/dropdown/index", //启动页面，必选
9+
// "path": "pages/componentsC/test/index", //启动页面，必选
1010
// "query": "uuid=c4bba940-f69e-11ea-a419-6bafda9d095e&__id__=1" //启动参数，在页面的onLoad函数里面得到
1111
// }]
1212
// },

‎pages/componentsB/waterfall/index.vue

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,30 @@
33
<u-waterfall v-model="flowList" ref="uWaterfall">
44
<template v-slot:left="{ leftList }">
55
<view class="demo-warter" v-for="(item, index) in leftList" :key="index">
6-
<!-- 警告：微信小程序不支持嵌入lazyload组件，请自行如下使用image标签 -->
7-
<!-- #ifndef MP-WEIXIN -->
6+
<!-- 微信小程序需要hx2.8.11版本才支持在template中引入其他组件，比如下方的u-lazy-load组件 -->
87
<u-lazy-load threshold="-450" border-radius="10" :image="item.image" :index="index"></u-lazy-load>
9-
<!-- #endif -->
10-
<!-- #ifdef MP-WEIXIN -->
11-
<view class="demo-img-wrap"><image class="demo-image" :src="item.image" mode="widthFix"></image></view>
12-
<!-- #endif -->
138
<view class="demo-title">{{ item.title }}</view>
149
<view class="demo-price">{{ item.price }}元</view>
1510
<view class="demo-tag">
1611
<view class="demo-tag-owner">自营</view>
1712
<view class="demo-tag-text">放心购</view>
1813
</view>
1914
<view class="demo-shop">{{ item.shop }}</view>
20-
<!-- 微信小程序无效，因为它不支持在template中引入组件 -->
2115
<view class="u-close">
2216
<u-icon name="close-circle-fill" color="#fa3534" size="34" @click="remove(item.id)"></u-icon>
2317
</view>
2418
</view>
2519
</template>
2620
<template v-slot:right="{ rightList }">
2721
<view class="demo-warter" v-for="(item, index) in rightList" :key="index">
28-
<!-- #ifndef MP-WEIXIN -->
2922
<u-lazy-load threshold="-450" border-radius="10" :image="item.image" :index="index"></u-lazy-load>
30-
<!-- #endif -->
31-
<!-- #ifdef MP-WEIXIN -->
32-
<view class="demo-img-wrap"><image class="demo-image" :src="item.image" mode="widthFix"></image></view>
33-
<!-- #endif -->
3423
<view class="demo-title">{{ item.title }}</view>
3524
<view class="demo-price">{{ item.price }}元</view>
3625
<view class="demo-tag">
3726
<view class="demo-tag-owner">自营</view>
3827
<view class="demo-tag-text">放心购</view>
3928
</view>
4029
<view class="demo-shop">{{ item.shop }}</view>
41-
<!-- 微信小程序无效，因为它不支持在template中引入组件 -->
4230
<view class="u-close">
4331
<u-icon name="close-circle-fill" color="#fa3534" size="34" @click="remove(item.id)"></u-icon>
4432
</view>

‎pages/componentsC/test/index.vue

Lines changed: 216 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,240 @@
11
<template>
2-
<view class="">
3-
<u-checkbox-group @change="checkboxGroupChange">
4-
<u-checkbox
5-
@change="checkboxChange"
6-
v-model="item.checked"
7-
v-for="(item, index) in list" :key="index"
8-
:name="item.name"
9-
>{{item.name}}</u-checkbox>
10-
</u-checkbox-group>
11-
<u-button @click="checkedAll">全选</u-button>
2+
<view class="wrap">
3+
<u-waterfall v-model="flowList" ref="uWaterfall">
4+
<template v-slot:left="{ leftList }">
5+
<view class="demo-warter" v-for="(item, index) in leftList" :key="index">
6+
<view class="" @tap="click1(item)">
7+
<!-- 警告：微信小程序不支持嵌入lazyload组件，请自行如下使用image标签 -->
8+
<!-- #ifndef MP-WEIXIN -->
9+
<u-lazy-load threshold="-450" border-radius="10" :image="item.image" :index="index"></u-lazy-load>
10+
<!-- #endif -->
11+
<!-- #ifdef MP-WEIXIN -->
12+
<view class="demo-img-wrap"><image class="demo-image" :src="item.image" mode="widthFix"></image></view>
13+
<!-- #endif -->
14+
<view class="demo-title">{{ item.title }}</view>
15+
<view class="demo-price">{{ item.price }}元</view>
16+
<view class="demo-tag">
17+
<view class="demo-tag-owner">自营</view>
18+
<view class="demo-tag-text">放心购</view>
19+
</view>
20+
<view class="demo-shop">{{ item.shop }}</view>
21+
<!-- 微信小程序无效，因为它不支持在template中引入组件 -->
22+
<view class="u-close">
23+
<u-icon name="close-circle-fill" color="#fa3534" size="34" @click="remove(item.id)"></u-icon>
24+
</view>
25+
</view>
26+
</view>
27+
</template>
28+
<template v-slot:right="{ rightList }">
29+
<view class="demo-warter" v-for="(item, index) in rightList" :key="index">
30+
<!-- #ifndef MP-WEIXIN -->
31+
<u-lazy-load threshold="-450" border-radius="10" :image="item.image" :index="index"></u-lazy-load>
32+
<!-- #endif -->
33+
<!-- #ifdef MP-WEIXIN -->
34+
<view class="demo-img-wrap"><image class="demo-image" :src="item.image" mode="widthFix"></image></view>
35+
<!-- #endif -->
36+
<view class="demo-title">{{ item.title }}</view>
37+
<view class="demo-price">{{ item.price }}元</view>
38+
<view class="demo-tag">
39+
<view class="demo-tag-owner">自营</view>
40+
<view class="demo-tag-text">放心购</view>
41+
</view>
42+
<view class="demo-shop">{{ item.shop }}</view>
43+
<!-- 微信小程序无效，因为它不支持在template中引入组件 -->
44+
<view class="u-close">
45+
<u-icon name="close-circle-fill" color="#fa3534" size="34" @click="remove(item.id)"></u-icon>
46+
</view>
47+
</view>
48+
</template>
49+
</u-waterfall>
50+
<u-loadmore bg-color="rgb(240, 240, 240)" :status="loadStatus" @loadmore="addRandomData"></u-loadmore>
1251
</view>
1352
</template>
1453

1554
<script>
1655
export default {
1756
data() {
1857
return {
58+
loadStatus: 'loadmore',
59+
flowList: [],
1960
list: [
2061
{
21-
name: 'apple',
22-
checked: false,
23-
disabled: false
62+
price: 35,
63+
title: '北国风光，千里冰封，万里雪飘',
64+
shop: '李白杜甫白居易旗舰店',
65+
image: 'http://pic.sc.chinaz.com/Files/pic/pic9/202002/zzpic23327_s.jpg'
2466
},
2567
{
26-
name: 'banner',
27-
checked: false,
28-
disabled: false
68+
price: 75,
69+
title: '望长城内外，惟余莽莽',
70+
shop: '李白杜甫白居易旗舰店',
71+
image: 'http://pic.sc.chinaz.com/Files/pic/pic9/202002/zzpic23325_s.jpg'
2972
},
3073
{
31-
name: 'orange',
32-
checked: false,
33-
disabled: false
74+
price: 385,
75+
title: '大河上下，顿失滔滔',
76+
shop: '李白杜甫白居易旗舰店',
77+
image: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg'
78+
},
79+
{
80+
price: 784,
81+
title: '欲与天公试比高',
82+
shop: '李白杜甫白居易旗舰店',
83+
image: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/zzpic23369_s.jpg'
84+
},
85+
{
86+
price: 7891,
87+
title: '须晴日，看红装素裹，分外妖娆',
88+
shop: '李白杜甫白居易旗舰店',
89+
image: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2130_s.jpg'
90+
},
91+
{
92+
price: 2341,
93+
shop: '李白杜甫白居易旗舰店',
94+
title: '江山如此多娇，引无数英雄竞折腰',
95+
image: 'http://pic1.sc.chinaz.com/Files/pic/pic9/202002/zzpic23346_s.jpg'
96+
},
97+
{
98+
price: 661,
99+
shop: '李白杜甫白居易旗舰店',
100+
title: '惜秦皇汉武，略输文采',
101+
image: 'http://pic1.sc.chinaz.com/Files/pic/pic9/202002/zzpic23344_s.jpg'
102+
},
103+
{
104+
price: 1654,
105+
title: '唐宗宋祖，稍逊风骚',
106+
shop: '李白杜甫白居易旗舰店',
107+
image: 'http://pic1.sc.chinaz.com/Files/pic/pic9/202002/zzpic23343_s.jpg'
108+
},
109+
{
110+
price: 1678,
111+
title: '一代天骄，成吉思汗',
112+
shop: '李白杜甫白居易旗舰店',
113+
image: 'http://pic1.sc.chinaz.com/Files/pic/pic9/202002/zzpic23343_s.jpg'
114+
},
115+
{
116+
price: 924,
117+
title: '只识弯弓射大雕',
118+
shop: '李白杜甫白居易旗舰店',
119+
image: 'http://pic1.sc.chinaz.com/Files/pic/pic9/202002/zzpic23343_s.jpg'
120+
},
121+
{
122+
price: 8243,
123+
title: '俱往矣，数风流人物，还看今朝',
124+
shop: '李白杜甫白居易旗舰店',
125+
image: 'http://pic1.sc.chinaz.com/Files/pic/pic9/202002/zzpic23343_s.jpg'
34126
}
35127
]
36128
};
37129
},
130+
onLoad() {
131+
this.addRandomData();
132+
},
133+
onReachBottom() {
134+
this.loadStatus = 'loading';
135+
// 模拟数据加载
136+
setTimeout(() => {
137+
this.addRandomData();
138+
this.loadStatus = 'loadmore';
139+
}, 1000);
140+
},
38141
methods: {
39-
// 选中某个复选框时，由checkbox时触发
40-
checkboxChange(e) {
41-
console.log(e);
142+
addRandomData() {
143+
for (let i = 0; i < 10; i++) {
144+
let index = this.$u.random(0, this.list.length - 1);
145+
// 先转成字符串再转成对象，避免数组对象引用导致数据混乱
146+
let item = JSON.parse(JSON.stringify(this.list[index]));
147+
item.id = this.$u.guid();
148+
this.flowList.push(item);
149+
}
150+
},
151+
remove(id) {
152+
this.$refs.uWaterfall.remove(id);
42153
},
43-
// 选中任一checkbox时，由checkbox-group触发
44-
checkboxGroupChange(e) {
45-
// console.log(e);
154+
clear() {
155+
this.$refs.uWaterfall.clear();
46156
},
47-
// 全选
48-
checkedAll() {
49-
this.list.map(val => {
50-
val.checked = true;
51-
})
157+
click1(item){
158+
console.log(item);
52159
}
53160
}
54161
};
55-
</script>
162+
</script>
163+
164+
<style>
165+
/* page不能写带scope的style标签中，否则无效 */
166+
page {
167+
background-color: rgb(240, 240, 240);
168+
}
169+
</style>
170+
171+
<style lang="scss" scoped>
172+
.demo-warter {
173+
border-radius: 8px;
174+
margin: 5px;
175+
background-color: #ffffff;
176+
padding: 8px;
177+
position: relative;
178+
}
179+
180+
.u-close {
181+
position: absolute;
182+
top: 32rpx;
183+
right: 32rpx;
184+
}
185+
186+
.demo-img-wrap {
187+
}
188+
189+
.demo-image {
190+
width: 100%;
191+
border-radius: 4px;
192+
}
193+
194+
.demo-title {
195+
font-size: 30rpx;
196+
margin-top: 5px;
197+
color: $u-main-color;
198+
}
199+
200+
.demo-tag {
201+
display: flex;
202+
margin-top: 5px;
203+
}
204+
205+
.demo-tag-owner {
206+
background-color: $u-type-error;
207+
color: #ffffff;
208+
display: flex;
209+
align-items: center;
210+
padding: 4rpx 14rpx;
211+
border-radius: 50rpx;
212+
font-size: 20rpx;
213+
line-height: 1;
214+
}
215+
216+
.demo-tag-text {
217+
border: 1px solid $u-type-primary;
218+
color: $u-type-primary;
219+
margin-left: 10px;
220+
border-radius: 50rpx;
221+
line-height: 1;
222+
padding: 4rpx 14rpx;
223+
display: flex;
224+
align-items: center;
225+
border-radius: 50rpx;
226+
font-size: 20rpx;
227+
}
228+
229+
.demo-price {
230+
font-size: 30rpx;
231+
color: $u-type-error;
232+
margin-top: 5px;
233+
}
234+
235+
.demo-shop {
236+
font-size: 22rpx;
237+
color: $u-tips-color;
238+
margin-top: 5px;
239+
}
240+
</style>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
zIndex: uZIndex,
77
opacity: opacity
88
}, customStyle]">
9-
<view class="u-back-top__content" v-if="!$slots.default">
9+
<view class="u-back-top__content" v-if="!$slots.default && !$slots.$default">
1010
<u-icon @click="backToTop" :name="icon" :custom-style="iconStyle"></u-icon>
1111
<view class="u-back-top__content__tips">
1212
{{tips}}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
/**
7575
* card 卡片
7676
* @description 卡片组件一般用于多个列表条目，且风格统一的场景
77-
* @tutorial https://www.uviewui.com/components/line.html
77+
* @tutorial https://www.uviewui.com/components/card.html
7878
* @property {Boolean} full 卡片与屏幕两侧是否留空隙（默认false）
7979
* @property {String} title 头部左边的标题
8080
* @property {String} title-color 标题颜色（默认#303133）

‎uview-ui/components/u-dropdown-item/u-dropdown-item.vue

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<view class="u-dropdown-item" v-if="active" @touchmove.stop.prevent="() => {}" @tap.stop.prevent="() => {}">
3-
<block v-if="!$slots.default">
3+
<block v-if="!$slots.default && !$slots.$default">
44
<scroll-view scroll-y="true" :style="{
55
height: $u.addUnit(height)
66
}">
@@ -21,6 +21,18 @@
2121
</template>
2222

2323
<script>
24+
/**
25+
* dropdown-item 下拉菜单
26+
* @description 该组件一般用于向下展开菜单，同时可切换多个选项卡的场景
27+
* @tutorial http://uviewui.com/components/dropdown.html
28+
* @property {String | Number} v-model 双向绑定选项卡选择值
29+
* @property {String} title 菜单项标题
30+
* @property {Array[Object]} options 选项数据，如果传入了默认slot，此参数无效
31+
* @property {Boolean} disabled 是否禁用此选项卡（默认false）
32+
* @property {String | Number} duration 选项卡展开和收起的过渡时间，单位ms（默认300）
33+
* @property {String | Number} height 弹窗下拉内容的高度(内容超出将会滚动)（默认auto）
34+
* @example <u-dropdown-item title="标题"></u-dropdown-item>
35+
*/
2436
export default {
2537
name: 'u-dropdown-item',
2638
props: {

0 commit comments

Comments
 (0)